DomoAriGato

SQCSim-common/bullet.cpp

@@ -7,7 +7,7 @@ Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t tid): m_startpos(pos), m_cur
 
 Bullet::~Bullet() {}
 
-bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> mapPlayer) {
+bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> mapPlayer, netprot::ChunkMod** chunkmod) {
 	int max = 100 / perframe;
 	float damage = 0.057f;
 	for (int x = 0; x < max; ++x) {
@@ -23,6 +23,15 @@ bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordere
 		if (!world->ChunkAt(m_currentpos))
 			return true;
 		else if (world->BlockAt(m_currentpos) != BTYPE_AIR) {
+			if (chunkmod) {
+				using namespace netprot;
+				ChunkMod* cmod = *chunkmod;
+				cmod = new ChunkMod();
+				cmod->old_b_type = world->BlockAt(m_currentpos);
+				cmod->b_type = BTYPE_AIR;
+				cmod->pos = m_currentpos;
+			}
+
 			world->ChangeBlockAtPosition(BTYPE_AIR, m_currentpos);
 			return true;
 		}

SQCSim-common/bullet.h

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

SQCSim-common/chunk.cpp

@@ -9,10 +9,6 @@ Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y
 	//if (input.fail()) {
 	OpenSimplexNoise::Noise simplex = OpenSimplexNoise::Noise(seed);
 	m_blocks.Reset(BTYPE_AIR);
-	int ratio = 0;
-
-	ratio = x * y % 7;
-
 
 	for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // Montagnes
 		for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
@@ -51,8 +47,8 @@ Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y
 			}
 		}
 
-	//int rnd = rand() % 15;
+	int rnd = rand() % 15;
-	if (ratio == 1)
+	if (rnd == 4)
 		for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // structure
 			for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
 				for (int iy = 0; iy < 14; ++iy) {
@@ -61,16 +57,16 @@ Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y
 							Structure(ix, iy, iz, 2);
 				}
 			}
-	if (ratio == 3)
+	if (rnd == 3)
 		for (int ix = 0; ix < CHUNK_SIZE_Z; ++ix) // structure
 			for (int iz = 0; iz < CHUNK_SIZE_X; ++iz) {
 				for (int iy = 0; iy < 14; ++iy) {
 					if (iz == 4)
 						if (GetBlock(ix, iy, iz) == BTYPE_AIR)
-							Structure(ix, iy, iz, 1);
+							Structure(ix, iy, iz, 2);
 				}
 			}
-	if (ratio == 5)
+	if (rnd == 6)
 		for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // structure
 			for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
 				for (int iy = 0; iy < 14; ++iy) {

SQCSim-common/define.h

@@ -41,15 +41,17 @@ typedef uint8_t BlockType;
 enum BLOCK_TYPE { BTYPE_AIR, BTYPE_DIRT, BTYPE_GRASS, BTYPE_METAL, BTYPE_ICE, BTYPE_GREENGRASS, BTYPE_LAST };
 typedef uint8_t BoostType;
 enum BOOST_TYPE { BTYPE_SPEED, BTYPE_HEAL, BTYPE_DAMAGE, BTYPE_INVINCIBLE, BTYPE_BOOST_LAST };
+
+//anim 
 enum ANIM_TYPE { STILL = 0, SHOOTING = 8, JUMPING = 16, JUMPINGSHOOTING = 24, DEAD = 32, TYPE_LAST = 40};
 enum ANIM_POS {FRONT, QUARTER_FRONT_LEFT, QUATER_FRONT_RIGHT, PROFIL_LEFT, PROFIL_RIGHT, QUARTER_BACK_LEFT, QUARTER_BACK_RIGHT, BACK , POS_LAST};
+
 typedef uint64_t Timestamp;
 
 #ifdef _WIN32
 
 #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>
@@ -74,6 +76,7 @@ typedef uint64_t Timestamp;
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <cstring>
+#include <poll.h>
 
 #define flag_t unsigned int
 #define addrlen_t unsigned int

SQCSim-common/netprotocol.cpp

@@ -29,13 +29,13 @@ void netprot::Serialize(Input* in, char* buf[], uint32_t* buflen) {
 
 	Keys keys = in->keys;
 	uint8_t keys8 = // Reste un bit.
-		keys.forward & 0b10000000 |
+		(keys.forward? 0b10000000: 0) |
-		keys.backward & 0b01000000 |
+		(keys.backward? 0b01000000: 0) |
-		keys.left & 0b00100000 |
+		(keys.left? 0b00100000: 0) |
-		keys.right & 0b00010000 |
+		(keys.right? 0b00010000: 0) |
-		keys.jump & 0b00001000 |
+		(keys.jump? 0b00001000: 0) |
-		keys.shoot & 0b00000100 |
+		(keys.shoot? 0b00000100: 0) |
-		keys.block & 0b00000010;
+		(keys.block? 0b00000010: 0);
 
 	memcpy(*buf + sizeof(uint64_t) * 2 + 1, &keys8, sizeof(uint8_t));
 
@@ -90,14 +90,14 @@ void netprot::Serialize(Output* out, char* buf[], uint32_t* buflen) {
 
 	States states = out->states;
 	uint8_t states8 =
-		states.jumping & 0b10000000 |
+		(states.jumping? 0b10000000: 0) |
-		states.shooting & 0b01000000 |
+		(states.shooting? 0b01000000: 0) |
-		states.hit & 0b00100000 |
+		(states.hit? 0b00100000: 0) |
-		states.powerup & 0b00010000 |
+		(states.powerup? 0b00010000: 0) |
-		states.dead & 0b00001000 |
+		(states.dead? 0b00001000: 0) |
-		states.still & 0b00000100 |
+		(states.still? 0b00000100: 0) |
-		states.jumpshot & 0b00000010 |
+		(states.jumpshot? 0b00000010: 0) |
-		states.running & 0b00000001;
+		(states.running? 0b00000001: 0);
 
 	memcpy(*buf + sizeof(uint64_t) * 2 + 1, &states8, sizeof(uint8_t));
 
@@ -402,6 +402,34 @@ void netprot::Serialize(Chat* chat, char* buf[], uint32_t* buflen) {
 	*buflen = messize + sizeof(uint64_t) * 3 + 2;
 }
 
+void netprot::Serialize(ChunkMod* chmod, char* buf[], uint32_t* buflen) {
+	*buf[0] = (char)netprot::PACKET_TYPE::CHUNKMOD;
+
+	uint32_t vec[3];
+	memcpy(vec, &chmod->pos, 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 + 1, vec8, sizeof(uint32_t) * 3);
+
+	memcpy(*buf + sizeof(uint32_t) * 3 + 1, &chmod->b_type, sizeof(BlockType));
+	memcpy(*buf + sizeof(uint32_t) * 3 + 2, &chmod->old_b_type, sizeof(BlockType));
+
+	*buflen = sizeof(uint32_t) * 3 + 3;
+}
+
 void netprot::Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen) {
 	*buf[0] = (char)netprot::PACKET_TYPE::ERRLOG;
 
@@ -818,6 +846,36 @@ bool netprot::Deserialize(Chat* chat, char* buf, uint32_t *buflen) {
 	return true;
 }
 
+bool netprot::Deserialize(ChunkMod* chmod, char* buf, uint32_t* buflen) {
+	if (*buflen <= sizeof(ChunkMod))
+		return false;
+
+	uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
+	memcpy(subvec, &buf[1], 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(&chmod->pos, vec, sizeof(uint32_t) * 3);
+
+	memcpy(&chmod->b_type, &buf[1 + sizeof(uint8_t) * 12], sizeof(BlockType));
+	memcpy(&chmod->old_b_type, &buf[2 + sizeof(uint8_t) * 12], sizeof(BlockType));
+
+	*buflen = sizeof(uint32_t) * 3 + 3;
+
+	return true;
+}
+
 bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t *buflen) {
 	if (*buflen <= sizeof(ErrorLog))
 		return false;

SQCSim-common/netprotocol.h

@@ -130,6 +130,11 @@ namespace netprot {
 		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 ChunkMod {
+		Vector3f pos;
+		BlockType b_type, old_b_type;
+	};
+
 	struct ErrorLog {									// srv -> cli			TCP			event
 		char mess[140];
 		bool is_fatal;
@@ -147,6 +152,7 @@ namespace netprot {
 	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(ChunkMod* chmod, char* buf[], uint32_t* buflen); // srv
 	void Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen); // srv
 
 	bool Deserialize(Input* in, char* buf, uint32_t* buflen); // srv
@@ -157,6 +163,7 @@ namespace netprot {
 	bool Deserialize(PlayerInfo* pinfo, char* buf, uint32_t* buflen); // cli
 	bool Deserialize(GameInfo* ginfo, char* buf, uint32_t* buflen); // cli
 	bool Deserialize(Chat* chat, char* buf, uint32_t* buflen); // srv/cli
+	bool Deserialize(ChunkMod* chmod, char* buf, uint32_t* buflen); // cli
 	bool Deserialize(ErrorLog* errlog, char* buf, uint32_t* buflen); // srv
 
 	PACKET_TYPE getType(char* buf, uint32_t buflen);

SQCSim-common/player.cpp

@@ -14,17 +14,6 @@ void Player::TurnLeftRight(float value) {
 	m_rotY += value;
 	if (m_rotY > 360) m_rotY = 0;
 	else if (m_rotY < -360) m_rotY = 0;
-}
-
-void Player::TurnTopBottom(float value) {
-	m_rotX += value;
-	if (m_rotX > 80) m_rotX = 80;
-	else if (m_rotX < -80) m_rotX = -80;
-}
-
-Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jump, bool shoot, float elapsedTime) {
-
-	Vector3f delta = Vector3f(0, 0, 0);
 
 	float yrotrad = (m_rotY / 57.2957795056f); // 180/Pi = 57.295...
 	float xrotrad = (m_rotX / 57.2957795056f);
@@ -34,23 +23,44 @@ Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jum
 		cos(xrotrad) * -cos(yrotrad));
 
 	m_direction.Normalize();
+}
+
+void Player::TurnTopBottom(float value) {
+	m_rotX += value;
+	if (m_rotX > 80) m_rotX = 80;
+	else if (m_rotX < -80) m_rotX = -80;
+
+	float yrotrad = (m_rotY / 57.2957795056f); // 180/Pi = 57.295...
+	float xrotrad = (m_rotX / 57.2957795056f);
+
+	m_direction = Vector3f(cos(xrotrad) * sin(yrotrad),
+		-sin(xrotrad),
+		cos(xrotrad) * -cos(yrotrad));
+
+	m_direction.Normalize();
+}
+
+Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jump, bool shoot, float elapsedTime) {
+	Vector3f delta = Vector3f(0, 0, 0);
+
+	Vector3f dir = m_direction;
+
+	dir.y = 0;
 
 	if (front) {
-		delta.x += float(sin(yrotrad)) * elapsedTime * 10.f;
+		delta += dir;
-		delta.z += float(-cos(yrotrad)) * elapsedTime * 10.f;
 	}
 	else if (back) {
-		delta.x += float(-sin(yrotrad)) * elapsedTime * 10.f;
+		delta -= dir;
-		delta.z += float(cos(yrotrad)) * elapsedTime * 10.f;
 	}
 
 	if (left) {
-		delta.x += float(-cos(yrotrad)) * elapsedTime * 10.f;
+		delta.x += dir.z;
-		delta.z += float(-sin(yrotrad)) * elapsedTime * 10.f;
+		delta.z += -dir.x;
 	}
 	else if (right) {
-		delta.x += float(cos(yrotrad)) * elapsedTime * 10.f;
+		delta.x -= dir.z;
-		delta.z += float(sin(yrotrad)) * elapsedTime * 10.f;
+		delta.z -= -dir.x;
 	}
 
 	delta.Normalize();
@@ -194,11 +204,11 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
 void Player::ApplyTransformation(Transformation& transformation, bool rel, bool rot) const {
 	transformation.ApplyRotation(-m_rotX, 1, 0, 0);
 	transformation.ApplyRotation(-m_rotY, 0, 1, 0);
+	
+
 	if (rel) transformation.ApplyTranslation(-GetPOV());
-	if (!rot) {
+	
-		transformation.ApplyRotation(-m_rotX, 1, 0, 0);
+
-		transformation.ApplyRotation(-m_rotY, 0, 1, 0);
-	}
 }
 
 void Player::GetBooster(Booster boosttype)
@@ -246,8 +256,12 @@ void Player::RemoveBooster(float elapsedtime)
 }
 void Player::SetDirection(Vector3f dir) { m_direction = dir; }
 
+void Player::Move(Vector3f diff) { m_position -= diff; }
+
 Vector3f Player::GetPosition() const { return Vector3f(m_position.x + CHUNK_SIZE_X * WORLD_SIZE_X / 2, m_position.y, m_position.z + CHUNK_SIZE_Z * WORLD_SIZE_Y / 2); }
 
+Vector3f Player::GetPositionAbs() const { return m_position; }
+
 Vector3f Player::GetVelocity() const { return m_velocity; }
 
 Vector3f Player::GetPOV() const { return Vector3f(GetPosition().x, m_POV, GetPosition().z); }

SQCSim-common/player.h

@@ -25,7 +25,9 @@ public:
 	void ApplyTransformation(Transformation& transformation, bool rel = true, bool rot = true) const;
 
 	void SetDirection(Vector3f dir);
+	void Move(Vector3f diff);
 	Vector3f GetPosition() const;
+	Vector3f GetPositionAbs() const;
 	Vector3f GetDirection() const;
 	Vector3f GetVelocity() const;
 	Vector3f GetPOV() const;

SQCSim-common/world.cpp

@@ -169,31 +169,26 @@ void World::Update(Bullet* bullets[MAX_BULLETS], const Vector3f& player_pos, Blo
 	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) {
+netprot::ChunkMod* World::ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block, bool net) {
 	Vector3f currentPos = player_pos;
 	Vector3f currentBlock = currentPos;
 	Vector3f ray = player_dir;
+	BlockType oldbtype;
+	netprot::ChunkMod* cmod = nullptr;
 	bool found = false;
 
-	if (block) return;
+	if (block) return cmod;
 
 	while ((currentPos - currentBlock).Length() <= MAX_SELECTION_DISTANCE && !found) {
 		currentBlock += ray / 10.f;
 
 		BlockType bt = BlockAt(currentBlock);
 
-		if (bt != BTYPE_AIR)
+		if (bt != BTYPE_AIR) {
 			found = true;
+			oldbtype = bt;
+		}
 	}
 
 	if (found)
@@ -219,21 +214,30 @@ void World::ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos,
 						(By == PyA ||
 							By == PyB ||
 							By == PyC) &&
-						Bz == Pz))
+						Bz == Pz)) {
 						found = true;
+						oldbtype = bt;
+						}
 				}
 			}
 		}
 
 	if (found && (int)currentBlock.y < CHUNK_SIZE_Y) {
+		if (net) {
+			cmod = new netprot::ChunkMod();
+			cmod->old_b_type = oldbtype;
+			cmod->b_type = blockType;
+			cmod->pos = currentBlock;
+		}
 		int bx = (int)currentBlock.x % CHUNK_SIZE_X;
 		int 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;
 	}
+
+	return cmod;
 }
 
 void World::ChangeBlockAtPosition(BlockType blockType, Vector3f pos) {

SQCSim-common/world.h

@@ -11,6 +11,7 @@
 #include "array2d.h"
 #include "bullet.h"
 #include "chunk.h"
+#include "netprotocol.h"
 
 class Chunk;
 class Bullet;
@@ -37,7 +38,7 @@ public:
 
 	void GetScope(unsigned int& x, unsigned int& y);
 
-	void ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block);
+	netprot::ChunkMod* ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block, bool net);
 	void ChangeBlockAtPosition(BlockType blockType, Vector3f pos);
 	void CleanUpWorld(int& deleteframes, bool clear);
 	int GettbDeleted() const;

SQCSim-srv/connection.cpp

@@ -21,7 +21,7 @@ uint64_t Connection::GetTeamHash() const { return m_loginfo.tid; }
 
 std::string Connection::GetName() const { return m_loginfo.name; }
 
-void Connection::AddInput(Input in) { m_input_manifest.insert({ in.timestamp, in }); }
+void Connection::AddInput(Input in) { m_input_manifest.insert({ in.timestamp, in }); m_input_vector.push_back(in); }
 
 Output* Connection::getOutput(Timestamp time) {
 	auto out = m_output_manifest.find(time);
@@ -50,33 +50,62 @@ sockaddr_in* Connection::getAddr() const { return (sockaddr_in*)&m_addr; }
 void Connection::getPacks(SOCKET sock) {
 	std::vector<char*> lsPck;
 	Input in;
-	while (true) {
+	Sync sync;
 		lsPck = recvPacksFrom(sock, &m_buf, m_addr);
-
 		for (auto& pck : lsPck) {
 			uint32_t bsize = m_buf.len - (pck - m_buf.ptr);
 			switch (netprot::getType(pck, 1)) {
 				using enum netprot::PACKET_TYPE;
 			case INPUT:
-				if (Deserialize(&in, pck, &bsize))
+				if (Deserialize(&in, pck, &bsize)) {
 					m_input_manifest[in.timestamp] = in;
+					m_input_vector.push_back(in);
+				}
+				break;
+			case SYNC:
+				if (Deserialize(&sync, pck, &bsize))
+					m_nsync = true;
 				break;
 			default: break;
 			}
 		}
 		lsPck.clear();
-	}
 }
 
-void Connection::sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns) {
+void Connection::sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns, const uint32_t timer) {
-	while (m_last_out < m_output_manifest.size()) {
+	static int outs = 0;
-		Output out = m_output_manifest.at(m_last_out++);
+	static Timestamp last = 0;
-
+	while (!m_output_vector.empty()) {
+		Output out = m_output_vector.front();
 		for (auto& [key, conn] : conns) {
-			if (m_playinfo.id == conn->GetHash(true))
+			if (m_playinfo.id == conn->GetHash(false))
 				continue;
+			//std::cout << m_playinfo.id << ": " << m_playinfo.name << ": " << conn->GetName() << std::endl;
+			//std::cout << out.id << ": " << out.position << std::endl;
+
 			sendPackTo<Output>(sock, &out, &m_bufout, conn->getAddr());
 		}
+		++outs;
+
+		[[unlikely]] if (last == 0) // !
+			last = out.timestamp;
+
+		outs += out.timestamp + last;
+
+		if (outs >= 1000) {
+			outs -= 1000;
+			Sync sync;
+			sync.hp = player.get()->GetHP();
+			sync.timestamp = out.timestamp;
+			sync.position = out.position;
+			sync.sid = m_loginfo.sid;
+			sync.timer = timer;
+			sync.timestamp = out.timestamp;
+			sync.ammo = -1;
+			sendPackTo<Sync>(sock, &sync, &m_bufout, &m_addr);
+		}
+
+		m_output_vector.pop_front();
 	}
 }
 
@@ -88,11 +117,18 @@ void Connection::Run(World* world) {
 	if (m_input_manifest.size() < 2)
 		return;
 
-	while (m_last_in < m_input_manifest.size()) {
+	while (m_last_in < m_input_vector.size() - 1) {
-		in = m_input_manifest.at(m_last_in + 1);
+		in = m_input_vector.at(m_last_in + 1);
-		last = m_input_manifest.at(m_last_in);
+		last = m_input_vector.at(m_last_in);
+
+		el = (double)(in.timestamp - last.timestamp) / 1000.;
+
+		if (m_shoot_acc > 0.) {
+			m_shoot_acc -= el;
+			if (m_shoot_acc < 0.)
+				m_shoot_acc = 0;
+		}
 
-		el = (float)(in.timestamp - last.timestamp) / 1000.;
 		player.get()->SetDirection(in.direction);
 		player.get()->ApplyPhysics(player.get()->GetInput(in.keys.forward, 
 														  in.keys.backward, 
@@ -100,20 +136,28 @@ void Connection::Run(World* world) {
 														  in.keys.right, 
 														  in.keys.jump, false, el), world, el);
 
-		out.position = player.get()->GetPosition();
+		//if (in.keys.block)
+		//	ChunkDiffs.push_back()
+
+		if (in.keys.shoot && m_shoot_acc <= 0.)
+			Bullets.push_back(Bullet(player.get()->GetPOV() + player.get()->GetDirection(), player.get()->GetDirection()));
+		
+
+		out.position = player.get()->GetPositionAbs();
 		out.direction = in.direction;
 		out.timestamp = in.timestamp;
 		out.id = m_playinfo.id;
 
 		m_output_manifest[out.timestamp] = out;
+		m_output_vector.push_back(out);
 		
 		++m_last_in;
 	}
 }
 
 void Connection::CleanInputManifest(Timestamp time) {
-	auto wat = m_input_manifest.find(time);
+//	auto wat = m_input_manifest.find(time);
 
-	while (wat != m_input_manifest.begin())
+//	while (wat != m_input_manifest.begin())
-		m_input_manifest.erase(wat--);
+//		m_input_manifest.erase(wat--);
 }

SQCSim-srv/connection.h

@@ -34,16 +34,26 @@ public:
 	sockaddr_in* getAddr() const;
 
 	void getPacks(SOCKET sock);
-	void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns);
+	void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns, const uint32_t timer);
 
 	void Run(World* world);
 
 	void CleanInputManifest(Timestamp time);
+	
+	bool m_nsync = true;
+
+	std::vector<Bullet> Bullets;
+	std::vector<ChunkMod> ChunkDiffs;
+
 private:
 	std::unordered_map<Timestamp, Input> m_input_manifest;
+	std::vector<Input> m_input_vector;
 	std::unordered_map<Timestamp, Output> m_output_manifest;
+	std::deque<Output> m_output_vector;
 	std::unordered_map<Timestamp, Chat> m_chatlog;
 
+	float m_shoot_acc = 0;
+
 	SOCKET m_sock;
 	sockaddr_in m_addr;
 	LoginInfo m_loginfo;

SQCSim-srv/server.cpp

@@ -21,6 +21,7 @@ Server::~Server() {
 	for (const auto& [key, player] : m_players)
 		closesocket(player->getSock());
 	m_players.clear();
+	delete m_world;
 #ifdef _WIN32
 	WSACleanup();
 #endif
@@ -76,7 +77,8 @@ int Server::Ready() {
 		std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
 		try {
 			m_game.countdown = std::stoi(m_buf.ptr);
-		} catch(const std::exception& e) {
+		}
+		catch (const std::exception& e) {
 			Log(e.what(), true, false);
 			m_game.countdown = 0;
 		}
@@ -85,8 +87,9 @@ int Server::Ready() {
 		Log("Entrez le seed de la partie: ", false, false);
 		std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
 		try {
-			m_game.seed = std::stoi(m_buf.ptr);
+			m_game.seed = 9370707;//std::stoi(m_buf.ptr);
-		} catch(const std::exception& e) {
+		}
+		catch (const std::exception& e) {
 			Log(e.what(), true, false);
 			m_game.seed = 0;
 		}
@@ -96,7 +99,8 @@ int Server::Ready() {
 		std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
 		try {
 			nbrjoueurs = std::stoi(m_buf.ptr);
-		} catch(const std::exception& e) {
+		}
+		catch (const std::exception& e) {
 			Log(e.what(), true, false);
 			nbrjoueurs = 0;
 		}
@@ -145,24 +149,23 @@ int Server::Ready() {
 				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);
+				sendPackTo<LoginInfo>(m_sock_udp, log, &m_buf, &sockad);
 
 				play.id = getUniqueId();
+				play.tid = log->tid;
 				strcpy(play.name, log->name);
 
+				Log(str.append(play.name).append(" SID: [").append(std::to_string(log->sid)).append("]")
+					.append(" ID: [").append(std::to_string(play.id)).append("]")
+					.append(" TID: [").append(std::to_string(play.tid)).append("]"), false, false);
 				play.tid = log->tid;
 
-				sendPack<GameInfo>(sock, &m_game, &m_buf);
+				sendPackTo<GameInfo>(m_sock_udp, &m_game, &m_buf, &sockad);
+				std::cout << m_game.seed << std::endl;
 				Connection* conn = new Connection(sock, sockad, *log, play);
 
-				for (auto& [key, player] : m_players) {
+				m_players[log->sid] = conn;
-					sendPack<PlayerInfo>(player->getSock(), &play, &m_buf); // Envoyer les infos de joueur distant aux joueurs d<>j<EFBFBD> connect<63>s		
-					sendPack<PlayerInfo>(sock, player->getInfo(), &m_buf); // et envoyer les infos des joueurs distants au nouveau joueur.
-				}
-
-				m_players[log->sid] = std::move(conn);
 
 				delete log;
 
@@ -171,6 +174,13 @@ int Server::Ready() {
 			}
 		}
 	}
+	for (auto& [keyin, playin] : m_players) // Not pretty, but it works.
+		for (auto& [keyout, playout] : m_players) {
+			if (keyin == keyout)
+				continue;
+			sendPackTo<PlayerInfo>(m_sock_udp, playout->getInfo(), &m_buf, playin->getAddr()); // et envoyer les infos des joueurs distants au nouveau joueur.
+		}
+
 	return 0;
 }
 
@@ -190,51 +200,89 @@ void Server::Run() {
 	m_world->BuildWorld();
 
 	for (auto& [key, conn] : m_players) { // Creation des instances de joueurs et premier sync.
-		conn->player = std::make_unique<Player>(Vector3f(8.5f, CHUNK_SIZE_Y + 1.8f, 8.5f));
+		int x = rand() % (CHUNK_SIZE_X + WORLD_SIZE_X - 1), y = rand() % (CHUNK_SIZE_Y + WORLD_SIZE_Y - 1);
+		conn->player = std::make_unique<Player>(Vector3f(x + .5f, CHUNK_SIZE_Y + 1.8f, y + .5f));
 		Sync sync;
-		sync.position = conn->player->GetPosition();
+		sync.position = conn->player->GetPositionAbs();
 		sync.hp = conn->player->GetHP();
 		sync.sid = key;
 		sync.ammo = 0;
 		sync.timestamp = 0;
 		sync.timer = m_game.countdown;
-		sendPack<Sync>(conn->getSock(), &sync, &m_buf);
+		sendPackTo<Sync>(m_sock_udp, &sync, &m_buf, conn->getAddr());
 	}
 
+	int timer = m_game.countdown, sync_acc = 0;
+	std::chrono::high_resolution_clock::time_point start = std::chrono::high_resolution_clock::now();
+	Timestamp last = 0;
+	std::vector<Chat> chatlog;
+
 	while (!endgame) {
-		for (auto& [key, conn] : m_players) {
+		using namespace std::chrono;
-			conn->getPacks(m_sock_udp);
+		Timestamp tstamp = duration_cast<milliseconds>(high_resolution_clock::now() - start).count();
-			conn->Run(m_world);
+
-			conn->sendPacks(m_sock_udp, m_players);
+		if (last == 0)
-		}
+			last = tstamp;
+		sync_acc += tstamp - last;
+		if (sync_acc >= 1000) {
+			sync_acc -= 1000;
+			--timer;
 		}
 
-	//while (true) {
+		for (auto& [key, conn] : m_players) {
-	//	if (recvfrom(m_sock_udp, m_buf.ptr, m_buf.len, 0, (sockaddr*)&sockad, &socklen) > 0) {
+
-	//		Packet pck = getPack(&m_buf);
+			/* In */
-	//		switch (pck.type) {
+
-	//			using enum netprot::PACKET_TYPE;
+			int deadplayers = 0;
- //           	case ERR:			std::puts("ERROR!");		break;
+			std::vector<char*> lsPck;
- //               case INPUT:			std::puts("INPUT!");		break;
+			Input in; Chat chat; Sync sync;
- //               case OUTPUT:		std::puts("OUTPUT!");		break;
+			lsPck = recvPacks(m_sock_udp, &m_buf);
-	//			case SYNC:			std::puts("SYNC!");			break;
+			for (auto& pck : lsPck) {
- //               case TEAMINF:		std::puts("TEAMINF!");		break;
+				uint32_t bsize = m_buf.len - (pck - m_buf.ptr);
- //               case SELFINF:		std::puts("SELFINF!");		break;
+				switch (netprot::getType(pck, 1)) {
- //               case PLAYINF:		std::puts("PLAYINF!");		break;
+					using enum netprot::PACKET_TYPE;
- //               case LOGINF:		std::puts("LOGINF!");		break;
+				case INPUT:
- //               case CHUNKMOD:		std::puts("CHUNKMOD!");		break;
+					if (Deserialize(&in, pck, &bsize))
- //               case PLAYERMOD:		std::puts("PLAYERMOD!");	break;
+						m_players[in.sid]->AddInput(in);
- //               case PICKUPMOD:		std::puts("PICKUPMOD!");	break;
+					break;
- //               case GAMEINFO:		std::puts("GAMEINFO!");		break;
+				case SYNC:
- //               case ENDINFO:		std::puts("ENDINFO!");		break;
+					if (Deserialize(&sync, pck, &bsize)) {}
- //               case CHAT:			std::puts("CHAT!");			break;
+					break;
- //               case ERRLOG:		std::puts("ERRLOG!");		break;
+				case CHAT:
-	//			case LAST_PACK:									[[falltrough]];
+					if (Deserialize(&chat, pck, &bsize))
-	//			default:			std::puts("wtf?!");			break;
+						chatlog.push_back(chat);
- //           }
+					break;
-	//		netprot::emptyPack(pck);
+				default: break;
- //       }
+				}
-	//}
+			}
+			lsPck.clear();
+
+			/* Process */
+
+			if (conn->m_nsync) {
+				if (conn->player->AmIDead()) {
+					++deadplayers;
+					conn->m_nsync == false;
+					continue;
+				}
+				conn->Run(m_world);
+
+				/* Out */
+
+				conn->sendPacks(m_sock_udp, m_players, timer);
+			}
+
+			if (deadplayers == players - 1 || timer <= 0)
+				endgame = true;
+		}
+
+		for (auto& chat : chatlog)
+			for (auto& [key, conn] : m_players)
+				sendPackTo<Chat>(m_sock_udp, &chat, &m_buf, conn->getAddr());
+		chatlog.clear();
+	}
+
+	// TODO: Gérer les 2-3 secondes post-game avant le billboard pour pas avoir un whiplash à la fin de la game.
 
 }
 
@@ -279,6 +327,7 @@ void Server::Log(std::string str, bool is_error = false, bool is_fatal = false)
 		for (const auto& [key, player] : m_players) {
 			closesocket(player->getSock());
 		}
+		delete m_world;
 		m_players.clear();
 #ifdef _WIN32
 		WSACleanup();

SQCSim2021/SQCSim2021.vcxproj

@@ -27,7 +27,6 @@
     <ClInclude Include="mesh.h" />
     <ClInclude Include="openglcontext.h" />
     <ClInclude Include="remoteplayer.h" />
-    <ClInclude Include="settings.h" />
     <ClInclude Include="shader.h" />
     <ClInclude Include="skybox.h" />
     <ClInclude Include="texture.h" />
@@ -45,7 +44,6 @@
     <ClCompile Include="mesh.cpp" />
     <ClCompile Include="openglcontext.cpp" />
     <ClCompile Include="remoteplayer.cpp" />
-    <ClCompile Include="settings.cpp" />
     <ClCompile Include="shader.cpp" />
     <ClCompile Include="skybox.cpp" />
     <ClCompile Include="texture.cpp" />

SQCSim2021/SQCSim2021.vcxproj.filters

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

SQCSim2021/audio.cpp

@@ -48,7 +48,3 @@ void Audio::Render3DAudioObj(irrklang::ISound* sound, Vector3f& pos, Vector3f& v
 void Audio::ToggleMusicState() { m_music->setIsPaused(!m_music->getIsPaused()); }
 
 void Audio::PauseEngine() { m_engine->setAllSoundsPaused(); }
-
-float Audio::GetMusicVolume() const {
-	return m_music->getVolume();
-}

SQCSim2021/audio.h

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

SQCSim2021/booster.cpp

@@ -1,4 +1,4 @@
-#include "booster.h";
+#include "booster.h"
 
 void Booster::RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas,  Shader& shader, Transformation tran)
 {

SQCSim2021/cmake/CMakeLists.txt

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

SQCSim2021/connector.cpp

@@ -78,7 +78,7 @@ int Connector::Connect(const char* srv_addr, std::string name) {
 	int errors = 0;
 	std::vector<char*> lsPck;
 	while (!ready) {
-		lsPck = netprot::recvPacks(m_sock_tcp, &bf);
+		lsPck = netprot::recvPacks(m_sock_udp, &bf);
 
 		for (auto& pck : lsPck) {
 			uint32_t bsize = bf.len - (pck - bf.ptr);
@@ -97,7 +97,9 @@ int Connector::Connect(const char* srv_addr, std::string name) {
 				pl = new netprot::PlayerInfo();
 				if (!netprot::Deserialize(pl, pck, &bsize))
 					++errors;
-				else m_players[pl->id] = pl;
+				else {
+					m_players[pl->id] = pl;
+				}
 				break;
 			case TEAMINF:
 				// TODO: Faire dequoi avec TeamInfo si on fini par avoir des teams.

SQCSim2021/define.h

@@ -28,29 +28,22 @@
 #define BASE_WIDTH 640
 #define BASE_HEIGHT 480
 
+
 #define ANIME_PATH_JUMP		"./media/textures/AssetOtherPlayer/FinalPNGJumping/"
 #define ANIME_PATH_STILL	"./media/textures/AssetOtherPlayer/FinalPNGStanding/"
+
+//1 = jump shoot sans anim, 2 = jump shoot avec anim
+#define ANIM_PATH_JSHOOT1    "./media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/"
+#define ANIM_PATH_JSHOOT2	"./media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/"
+//1 = shoot sans anim, 2 = shoot avec anim
+#define ANIM_PATH_SSHOOT1	"./media/textures/AssetOtherPlayer/FinalPNGShooting/"
+#define ANIM_PATH_SSHOOT2	"./media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/"
+
 #define TEXTURE_PATH        "./media/textures/"
 #define SHADER_PATH		    "./media/shaders/"
 #define AUDIO_PATH			"./media/audio/"
 #define CHUNK_PATH			"./media/chunks/"
+#define MENU_ITEM_PATH		"./media/menu_items/"
 #define BOOSTER_TEXTURE_PATH "./media/textures/Booster/"
 
-enum GameState { 
-	MAIN_MENU, 
-	SPLASH,
-	LOBBY,
-	OPTIONS,
-	QUIT,
-	PLAY, 
-	PAUSE
-};
-
-enum Resolution {
-	HD = 0,		// 1280x720	 (High Definition)
-	FHD,		// 1920x1080 (Full HD)
-	QHD,		// 2560x1440 (Quad HD)
-	UHD			// 3840x2160 (Ultra HD)
-};
-
 #endif // DEFINE_H__

SQCSim2021/engine.h

@@ -24,12 +24,15 @@
 #include "renderer.h"
 #include "remoteplayer.h"
 #include "booster.h"
-#include "settings.h"
+
 
 class Engine : public OpenglContext {
 public:
     Engine();
     virtual ~Engine();
+    virtual void DrawMenu();
+    virtual void DrawPause();
+    virtual void DrawSplachScreen();
     virtual void Init();
     virtual void DeInit();
     virtual void LoadResource();
@@ -44,151 +47,93 @@ public:
 private:
     int GetFps(float elapsedTime) const;
     int GetCountdown(float elapsedTime);
-    int GetOptionsChoice();
-    void StartMultiplayerGame();
 
     bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true);
 
     void InstantDamage();
     void SystemNotification(std::string systemLog);
     void KillNotification(Player killer, Player killed);
-
     void DisplayNotification(std::string message);
+    void ProcessNotificationQueue();
     void DisplayCrosshair();
     void DisplayPovGun();
     void DisplayCurrentItem();
     void DisplayHud(int timer);
-    void DrawHud(float elapsedTime, BlockType bloc);
     void DisplayInfo(float elapsedTime, BlockType bloc);
-
+    void DisplaySingleOrMultiplayerMenu();
-    void DisplaySplashScreen();
+    void DrawHud(float elapsedTime, BlockType bloc);
-
-    void DisplayMainMenu();
-    void DrawButtonBackgrounds(float centerX, float centerY, int iterations);
-    void DrawMainMenuButtons(float centerX, float centerY);
-    void DrawSingleMultiButtons(float centerX, float centerY);
-
-    void DisplayLobbyMenu(float elapsedTime);
-    void SetPlayerUsername(float elapsedTime);
-    void SetServerAddress(float elapsedTime);
-
-    void DisplayOptionsMenu();
-    void DisplayAudioMenu(float centerX, float centerY);
-    void DisplayGraphicsMenu(float centerX, float centerY);
-    void DisplayGameplayMenu(float centerX, float centerY);
-    void DrawSliderBackground(float centerX, float centerY, float minVal, float maxVal, float bottomSideValue, float topSideValue);
-    void DisplayBarPercentValue(float centerX, float centerY, float posX, float posY, float minVal, float maxVal, float value);
-    void DrawSlider(float centerX, float centerY, float value, float minVal, float maxVal, float bottomSideValue, float topSideValue);
-
     void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
-    void ProcessNotificationQueue();
+
-    char SimulateKeyboard(unsigned char key);
+
-    void HandlePlayerInput(float elapsedTime);
+    
+
 
     Connector m_conn;
-
+    Shader m_shader01;
-    Audio m_audio = Audio(AUDIO_PATH "start.wav");
-    irrklang::ISound* m_powpow, * m_scream;
-    irrklang::ISound* m_whoosh[MAX_BULLETS];
-
-    Bullet* m_bullets[MAX_BULLETS];
-
-    std::chrono::high_resolution_clock::time_point m_startTime;
-    std::unordered_map<uint64_t, Player*> m_players;
-    netprot::Buffer m_buf, m_bufout;
-
-    netprot::PlayerInfo m_pinfo;
-    RemotePlayer m_remotePlayer = RemotePlayer(netprot::PlayerInfo(), Vector3f(5.5f, CHUNK_SIZE_Y + 1.8f, 5.5f));
-    std::string m_messageNotification = "";
-
-    World m_world = World();
-    Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f));
-
-    Renderer m_renderer = Renderer();
-
-    Booster m_booster = Booster();
     BlockInfo* m_blockinfo[BTYPE_LAST];
     BoostInfo* m_boostinfo[BTYPE_BOOST_LAST];
-
-    GameState m_gamestate = GameState::SPLASH;
-
-    Shader m_shader01;
-
-    Skybox m_skybox;
-
     TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);
     TextureAtlas m_animeAtlas = TextureAtlas(TYPE_LAST + POS_LAST);
 
-    TextureAtlas::TextureIndex texBoostHeal;
+    World m_world = World();
+    Renderer m_renderer = Renderer();
+    Booster m_booster = Booster();
 
     Texture m_textureCrosshair;
     Texture m_textureFont;
     Texture m_textureGun;
     Texture m_texturePovGun;
     Texture m_textureSkybox;
+    Texture m_textureSoloMultiMenu;
+    Texture m_textureSoloText;
+    Texture m_textureMultiText;
+    Texture m_textureTitle;
 
-    Texture m_textureLobbyMenu;
+    TextureAtlas::TextureIndex texBoostHeal;
-    Texture m_textureMainMenu;
-    Texture m_textureOptionsMenu;
-    Texture m_texturePauseMenu;
-    Texture m_textureSplashScreen;
 
-    Texture m_textureHd;
+    Skybox m_skybox;
-    Texture m_textureFhd;
+    Audio m_audio = Audio(AUDIO_PATH "start.wav");
-    Texture m_textureQhd;
-    Texture m_textureUhd;
 
-    Texture m_textureLobbyServer;
+    irrklang::ISound* m_powpow,
-    Texture m_textureLobbyIdentify;
+        * m_scream;
-    Texture m_textureCheck;
+    irrklang::ISound *m_whoosh[MAX_BULLETS];
-    Texture m_textureChecked;
 
-    Texture m_textureOptAudio;
+    Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f));
-    Texture m_textureOptBack;
-    Texture m_textureOptGameplay;
-    Texture m_textureOptGraphics;
-    Texture m_textureOptMain;
-    Texture m_textureOptMusic;
-    Texture m_textureOptOptions;
-    Texture m_textureOptResolution;
-    Texture m_textureOptSensitivity;
-    Texture m_textureOptSfx;
     
-    Texture m_textureMenuBack;
+    Bullet* m_bullets[MAX_BULLETS];
-    Texture m_textureMenuMulti;
+    std::vector<netprot::ChunkMod*> m_chunkmod_manifest;
-    Texture m_textureMenuOptions;
-    Texture m_textureMenuPlay;
-    Texture m_textureMenuQuit;
-    Texture m_textureMenuSingle;
-    Texture m_textureMenuTitle;
 
-    Settings m_options = Settings(m_audio);
+    std::unordered_map<uint64_t, Player*> m_players;
+    netprot::Buffer m_buf, m_bufout;
+    std::chrono::high_resolution_clock::time_point m_startTime;
+    netprot::ChunkMod* m_chunkmod = nullptr;
 
-    Resolution m_resolution = HD;
+    //Menu
+    enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY, PAUSE };
+    GameState m_gamestate = GameState::PLAY;
+    Texture MenuTitleTexture;
+    Texture MenuBGTexture;
+    Texture MenuStartTexture;
+    Texture MenuQuitTexture;
+    Texture MenuOptionsTexture;
+    Texture PauseBGTexture;
+    Texture SplachScreenTexture;
+
+    Vector3f m_otherplayerpos = Vector3f(999, 999, 999);
 
-    float m_splashTime = 2.0f;
     float m_scale;
     float m_time = 0;
+    float m_time_SplashScreen = 0;
     float m_titleX = 0;
     float m_titleY = 0;
+    float m_Width = 0;
+    float m_Height = 0;
 
     int m_renderCount = 0;
     int m_countdown = COUNTDOWN;
     int m_nbReductionChunk = 4;
     int m_timerReductionChunk = 30;
 
-    float m_volPrincipal = 0.0f;
-    float m_volMusique = 0.0f;
-    float m_volEffets = 0.0f;
-    float m_volSensible = 0.0f;
-
-    int m_selectedOption = 0;
-
-    bool m_selectedOptAudioMainBar = false;
-    bool m_selectedOptAudioMusicBar = false;
-	bool m_selectedOptAudioSfxBar = false;
-    bool m_selectedGameplaySensitivityBar = false;
-
     bool m_damage = false;
 
     bool m_wireframe = false;
@@ -202,43 +147,30 @@ private:
     bool m_soloMultiChoiceMade = false;
     bool m_stopcountdown = false;
     
-    bool m_selectedPlayOptions = false;
-    bool m_selectedOptions = false;
-    bool m_selectedQuit = false;
-
-    std::string m_currentInputString;
-    std::string m_username;
-    std::string m_serverAddr;
-    char m_inputChar = 0;
-    bool m_invalidChar = false;
-    bool m_charChanged = false;
-    bool m_settingUsername = false;
-    bool m_settingServer = false;
-    bool m_multiReady = false;
-    
     bool m_key1 = false;
     bool m_key2 = false;
+
     bool m_keyK = false;
     bool m_keyL = false;
     bool m_keyW = false;
     bool m_keyA = false;
     bool m_keyS = false;
     bool m_keyD = false;
-    bool m_keyEnter = false;
     bool m_keySpace = false;
-    bool m_keyShift = false;
-    bool m_keyBackspace = false;
-
     bool m_mouseL = false;
     bool m_mouseR = false;
     bool m_mouseC = false;
     bool m_mouseWU = false;
     bool m_mouseWD = false;
-
+    //Pour trouver ou est la souris
     float m_mousemx = 0;
     float m_mousemy = 0;
 
     bool m_networkgame = false;
+    netprot::PlayerInfo m_pinfo;
+    std::unordered_map<uint64_t, netprot::Sync> m_syncs;
+    RemotePlayer m_remotePlayer = RemotePlayer(netprot::PlayerInfo(),Vector3f(5.5f, CHUNK_SIZE_Y + 1.8f, 5.5f));
+    std::string m_messageNotification = "";
 };
 
 #endif // ENGINE_H__

SQCSim2021/main.cpp

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