Push connexion multiplayer.

Menus menus menus

SQCSim-common/chunk.cpp

@@ -9,6 +9,10 @@ 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) {
@@ -47,8 +51,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 (rnd == 4)
+	if (ratio == 1)
 		for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // structure
 			for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
 				for (int iy = 0; iy < 14; ++iy) {
@@ -57,16 +61,16 @@ Chunk::Chunk(unsigned int x, unsigned int y, int64_t seed) : m_posX(x), m_posY(y
 							Structure(ix, iy, iz, 2);
 				}
 			}
-	if (rnd == 3)
+	if (ratio == 3)
 		for (int ix = 0; ix < CHUNK_SIZE_Z; ++ix) // structure
 			for (int iz = 0; iz < CHUNK_SIZE_X; ++iz) {
 				for (int iy = 0; iy < 14; ++iy) {
 					if (iz == 4)
 						if (GetBlock(ix, iy, iz) == BTYPE_AIR)
-							Structure(ix, iy, iz, 2);
+							Structure(ix, iy, iz, 1);
 				}
 			}
-	if (rnd == 6)
+	if (ratio == 5)
 		for (int ix = 0; ix < CHUNK_SIZE_X; ++ix) // structure
 			for (int iz = 0; iz < CHUNK_SIZE_Z; ++iz) {
 				for (int iy = 0; iy < 14; ++iy) {

SQCSim-common/define.h

@@ -41,17 +41,15 @@ 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>
@@ -76,7 +74,6 @@ 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: 0) |
+		keys.forward & 0b10000000 |
-		(keys.backward? 0b01000000: 0) |
+		keys.backward & 0b01000000 |
-		(keys.left? 0b00100000: 0) |
+		keys.left & 0b00100000 |
-		(keys.right? 0b00010000: 0) |
+		keys.right & 0b00010000 |
-		(keys.jump? 0b00001000: 0) |
+		keys.jump & 0b00001000 |
-		(keys.shoot? 0b00000100: 0) |
+		keys.shoot & 0b00000100 |
-		(keys.block? 0b00000010: 0);
+		keys.block & 0b00000010;
 
 	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: 0) |
+		states.jumping & 0b10000000 |
-		(states.shooting? 0b01000000: 0) |
+		states.shooting & 0b01000000 |
-		(states.hit? 0b00100000: 0) |
+		states.hit & 0b00100000 |
-		(states.powerup? 0b00010000: 0) |
+		states.powerup & 0b00010000 |
-		(states.dead? 0b00001000: 0) |
+		states.dead & 0b00001000 |
-		(states.still? 0b00000100: 0) |
+		states.still & 0b00000100 |
-		(states.jumpshot? 0b00000010: 0) |
+		states.jumpshot & 0b00000010 |
-		(states.running? 0b00000001: 0);
+		states.running & 0b00000001;
 
 	memcpy(*buf + sizeof(uint64_t) * 2 + 1, &states8, sizeof(uint8_t));
 
@@ -431,7 +431,7 @@ bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
 		(uint64_t)diff[5] << 16 |
 		(uint64_t)diff[6] << 8 |
 		(uint64_t)diff[7];
-	
+
 	memcpy(diff, &buf[1 + sizeof(uint64_t)], sizeof(uint64_t));
 	in->sid =
 		(uint64_t)diff[0] << 56 |

SQCSim-common/player.cpp

@@ -14,53 +14,43 @@ void Player::TurnLeftRight(float value) {
 	m_rotY += value;
 	if (m_rotY > 360) m_rotY = 0;
 	else if (m_rotY < -360) m_rotY = 0;
-
-	float yrotrad = (m_rotY / 57.2957795056f); // 180/Pi = 57.295...
-	float xrotrad = (m_rotX / 57.2957795056f);
-
-	m_direction = Vector3f(cos(xrotrad) * sin(yrotrad),
-		-sin(xrotrad),
-		cos(xrotrad) * -cos(yrotrad));
-
-	m_direction.Normalize();
 }
 
 void Player::TurnTopBottom(float value) {
 	m_rotX += value;
 	if (m_rotX > 80) m_rotX = 80;
 	else if (m_rotX < -80) m_rotX = -80;
+}
+
+Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jump, bool shoot, float elapsedTime) {
+
+	Vector3f delta = Vector3f(0, 0, 0);
 
 	float yrotrad = (m_rotY / 57.2957795056f); // 180/Pi = 57.295...
 	float xrotrad = (m_rotX / 57.2957795056f);
 
 	m_direction = Vector3f(cos(xrotrad) * sin(yrotrad),
-		-sin(xrotrad),
+						   -sin(xrotrad),
-		cos(xrotrad) * -cos(yrotrad));
+						   cos(xrotrad) * -cos(yrotrad));
 
 	m_direction.Normalize();
-}
-
-Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jump, bool shoot, float elapsedTime) {
-	Vector3f delta = Vector3f(0, 0, 0);
-
-	Vector3f dir = m_direction;
-
-	dir.y = 0;
 
 	if (front) {
-		delta += dir;
+		delta.x += float(sin(yrotrad)) * elapsedTime * 10.f;
+		delta.z += float(-cos(yrotrad)) * elapsedTime * 10.f;
 	}
 	else if (back) {
-		delta -= dir;
+		delta.x += float(-sin(yrotrad)) * elapsedTime * 10.f;
+		delta.z += float(cos(yrotrad)) * elapsedTime * 10.f;
 	}
 
 	if (left) {
-		delta.x += dir.z;
+		delta.x += float(-cos(yrotrad)) * elapsedTime * 10.f;
-		delta.z += -dir.x;
+		delta.z += float(-sin(yrotrad)) * elapsedTime * 10.f;
 	}
 	else if (right) {
-		delta.x -= dir.z;
+		delta.x += float(cos(yrotrad)) * elapsedTime * 10.f;
-		delta.z -= -dir.x;
+		delta.z += float(sin(yrotrad)) * elapsedTime * 10.f;
 	}
 
 	delta.Normalize();
@@ -256,12 +246,8 @@ 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,9 +25,7 @@ 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-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 }); m_input_vector.push_back(in); }
+void Connection::AddInput(Input in) { m_input_manifest.insert({ in.timestamp, in }); }
 
 Output* Connection::getOutput(Timestamp time) {
 	auto out = m_output_manifest.find(time);
@@ -50,62 +50,33 @@ sockaddr_in* Connection::getAddr() const { return (sockaddr_in*)&m_addr; }
 void Connection::getPacks(SOCKET sock) {
 	std::vector<char*> lsPck;
 	Input in;
-	Sync sync;
+	while (true) {
 		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, const uint32_t timer) {
+void Connection::sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns) {
-	static int outs = 0;
+	while (m_last_out < m_output_manifest.size()) {
-	static Timestamp last = 0;
+		Output out = m_output_manifest.at(m_last_out++);
-	while (!m_output_vector.empty()) {
-		Output out = m_output_vector.front();
-		for (auto& [key, conn] : conns) {
-			if (m_playinfo.id == conn->GetHash(false))
-				continue;
-			//std::cout << m_playinfo.id << ": " << m_playinfo.name << ": " << conn->GetName() << std::endl;
-			//std::cout << out.id << ": " << out.position << std::endl;
 
+		for (auto& [key, conn] : conns) {
+			if (m_playinfo.id == conn->GetHash(true))
+				continue;
 			sendPackTo<Output>(sock, &out, &m_bufout, conn->getAddr());
 		}
-		++outs;
-
-		[[unlikely]] if (last == 0) // !
-			last = out.timestamp;
-
-		outs += out.timestamp + last;
-
-		if (outs >= 1000) {
-			outs -= 1000;
-			Sync sync;
-			sync.hp = player.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();
 	}
 }
 
@@ -117,36 +88,32 @@ void Connection::Run(World* world) {
 	if (m_input_manifest.size() < 2)
 		return;
 
-	while (m_last_in < m_input_vector.size() - 1) {
+	while (m_last_in < m_input_manifest.size()) {
-		in = m_input_vector.at(m_last_in + 1);
+		in = m_input_manifest.at(m_last_in + 1);
-		last = m_input_vector.at(m_last_in);
+		last = m_input_manifest.at(m_last_in);
 
-		el = (double)(in.timestamp - last.timestamp) / 1000.;
+		el = (float)(in.timestamp - last.timestamp) / 1000.;
-		std::cout << 1. / el << std::endl;
 		player.get()->SetDirection(in.direction);
-		std::cout << in.direction << std::endl;
 		player.get()->ApplyPhysics(player.get()->GetInput(in.keys.forward, 
 														  in.keys.backward, 
 														  in.keys.left, 
 														  in.keys.right, 
 														  in.keys.jump, false, el), world, el);
 
-		out.position = player.get()->GetPositionAbs();
+		out.position = player.get()->GetPosition();
-		player.get()->GetPositionAbs().Afficher();
 		out.direction = in.direction;
 		out.timestamp = in.timestamp;
 		out.id = m_playinfo.id;
 
 		m_output_manifest[out.timestamp] = out;
-		m_output_vector.push_back(out);
+
-		
 		++m_last_in;
 	}
 }
 
 void Connection::CleanInputManifest(Timestamp time) {
-//	auto wat = m_input_manifest.find(time);
+	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,18 +34,14 @@ public:
 	sockaddr_in* getAddr() const;
 
 	void getPacks(SOCKET sock);
-	void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns, const uint32_t timer);
+	void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns);
 
 	void Run(World* world);
 
 	void CleanInputManifest(Timestamp time);
-	
-	bool m_nsync = true;
 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;
 
 	SOCKET m_sock;

SQCSim-srv/server.cpp

@@ -20,8 +20,7 @@ Server::~Server() {
 		closesocket(m_sock_tcp);	
 	for (const auto& [key, player] : m_players)
 			closesocket(player->getSock());
-	m_players.clear();
+		m_players.clear();
-	delete m_world;
 #ifdef _WIN32
 	WSACleanup();
 #endif
@@ -86,7 +85,7 @@ int Server::Ready() {
 		Log("Entrez le seed de la partie: ", false, false);
 		std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
 		try {	
-			m_game.seed = 9370707;//std::stoi(m_buf.ptr);
+			m_game.seed = std::stoi(m_buf.ptr);
 		} catch(const std::exception& e) {
 			Log(e.what(), true, false);
 			m_game.seed = 0;
@@ -146,23 +145,24 @@ 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);
 
-				sendPackTo<LoginInfo>(m_sock_udp, log, &m_buf, &sockad);
+				sendPack<LoginInfo>(sock, log, &m_buf);
 				
 				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;
 
-				sendPackTo<GameInfo>(m_sock_udp, &m_game, &m_buf, &sockad);
+				sendPack<GameInfo>(sock, &m_game, &m_buf);
-				std::cout << m_game.seed << std::endl;
 				Connection* conn = new Connection(sock, sockad, *log, play);
 
-				m_players[log->sid] = conn;
+				for (auto& [key, player] : m_players) {
+					sendPack<PlayerInfo>(player->getSock(), &play, &m_buf); // Envoyer les infos de joueur distant aux joueurs d<>j<EFBFBD> connect<63>s		
+					sendPack<PlayerInfo>(sock, player->getInfo(), &m_buf); // et envoyer les infos des joueurs distants au nouveau joueur.
+				}
+
+				m_players[log->sid] = std::move(conn);
 
 				delete log;
 
@@ -171,13 +171,6 @@ 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;
 }
 
@@ -186,7 +179,7 @@ void Server::Run() {
 	Input in;
 	sockaddr_in sockad;
 	addrlen_t socklen = sizeof(sockad);
-
+	
 	Log("Debut de la partie...", false, false);
 
 	int players = m_players.size();
@@ -195,78 +188,54 @@ void Server::Run() {
 	m_world->SetSeed(m_game.seed);
 	m_world->GetChunks().Reset(nullptr);
 	m_world->BuildWorld();
-
+	
 	for (auto& [key, conn] : m_players) { // Creation des instances de joueurs et premier sync.
-		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(8.5f, CHUNK_SIZE_Y + 1.8f, 8.5f));
-		conn->player = std::make_unique<Player>(Vector3f(x + .5f, CHUNK_SIZE_Y + 1.8f, y + .5f));
 		Sync sync;
-		sync.position = conn->player->GetPositionAbs();
+		sync.position = conn->player->GetPosition();
 		sync.hp = conn->player->GetHP();
 		sync.sid = key;
 		sync.ammo = 0;
 		sync.timestamp = 0;
 		sync.timer = m_game.countdown;
-		sendPackTo<Sync>(m_sock_udp, &sync, &m_buf, conn->getAddr());
+		sendPack<Sync>(conn->getSock(), &sync, &m_buf);
-
-		int timer = m_game.countdown, sync_acc = 0;
-		std::chrono::high_resolution_clock::time_point start = std::chrono::high_resolution_clock::now();
-		Timestamp last = 0;
-
-		while (!endgame) {
-			using namespace std::chrono;
-			Timestamp tstamp = duration_cast<milliseconds>(high_resolution_clock::now() - start).count();
-
-			if (last == 0)
-				last = tstamp;
-			sync_acc += tstamp - last;
-			if (sync_acc >= 1000) {
-				sync_acc -= 1000;
-				--timer;
-			}
-
-			for (auto& [key, conn] : m_players) {
-				int deadplayers = 0;
-				std::vector<char*> lsPck;
-				Input in;
-				Sync sync;
-				lsPck = recvPacks(m_sock_udp, &m_buf);
-				for (auto& pck : lsPck) {
-					uint32_t bsize = m_buf.len - (pck - m_buf.ptr);
-					switch (netprot::getType(pck, 1)) {
-						using enum netprot::PACKET_TYPE;
-					case INPUT:
-						if (Deserialize(&in, pck, &bsize)) {
-							m_players[in.sid]->AddInput(in);
-						}
-						break;
-					case SYNC:
-						if (Deserialize(&sync, pck, &bsize)) {}
-						break;
-					case CHAT:
-						// TODO: Pitcher les chats à tous le monde.
-						break;
-					default: break;
-					}
-				}
-				lsPck.clear();
-
-				if (conn->m_nsync) {
-					if (conn->player->AmIDead()) {
-						++deadplayers;
-						continue;
-					}
-					conn->Run(m_world);
-					conn->sendPacks(m_sock_udp, m_players, timer);
-				}
-
-				if (deadplayers == players - 1 || timer <= 0)
-					endgame = true;
-			}
-		}
-
-		// TODO: Gérer les 2-3 secondes post-game avant le billboard pour pas avoir un whiplash à la fin de la game.
-
 	}
+
+	while (!endgame) {
+		for (auto& [key, conn] : m_players) {
+			conn->getPacks(m_sock_udp);
+			conn->Run(m_world);
+			conn->sendPacks(m_sock_udp, m_players);
+		}
+	}
+
+	//while (true) {
+	//	if (recvfrom(m_sock_udp, m_buf.ptr, m_buf.len, 0, (sockaddr*)&sockad, &socklen) > 0) {
+	//		Packet pck = getPack(&m_buf);
+	//		switch (pck.type) {
+	//			using enum netprot::PACKET_TYPE;
+ //           	case ERR:			std::puts("ERROR!");		break;
+ //               case INPUT:			std::puts("INPUT!");		break;
+ //               case OUTPUT:		std::puts("OUTPUT!");		break;
+	//			case SYNC:			std::puts("SYNC!");			break;
+ //               case TEAMINF:		std::puts("TEAMINF!");		break;
+ //               case SELFINF:		std::puts("SELFINF!");		break;
+ //               case PLAYINF:		std::puts("PLAYINF!");		break;
+ //               case LOGINF:		std::puts("LOGINF!");		break;
+ //               case CHUNKMOD:		std::puts("CHUNKMOD!");		break;
+ //               case PLAYERMOD:		std::puts("PLAYERMOD!");	break;
+ //               case PICKUPMOD:		std::puts("PICKUPMOD!");	break;
+ //               case GAMEINFO:		std::puts("GAMEINFO!");		break;
+ //               case ENDINFO:		std::puts("ENDINFO!");		break;
+ //               case CHAT:			std::puts("CHAT!");			break;
+ //               case ERRLOG:		std::puts("ERRLOG!");		break;
+	//			case LAST_PACK:									[[falltrough]];
+	//			default:			std::puts("wtf?!");			break;
+ //           }
+	//		netprot::emptyPack(pck);
+ //       }
+	//}
+
 }
 
 inline std::string Server::LogTimestamp() {
@@ -310,7 +279,6 @@ 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,6 +27,7 @@
     <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" />
@@ -44,6 +45,7 @@
     <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,6 +56,9 @@
     <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">
@@ -103,5 +106,8 @@
     <ClCompile Include="booster.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
+    <ClCompile Include="settings.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

SQCSim2021/audio.cpp

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

SQCSim2021/audio.h

@@ -33,6 +33,8 @@ 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)
 {
@@ -43,4 +43,4 @@ void Booster::RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas,  S
 	shader.Disable();
 	//tran.ApplyTranslation(-m_position);
 	//glEnable(GL_DEPTH_TEST);
-}
+}

SQCSim2021/cmake/CMakeLists.txt

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

SQCSim2021/define.h

@@ -28,22 +28,29 @@
 #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,15 +24,12 @@
 #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();
@@ -47,91 +44,151 @@ 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 DisplayInfo(float elapsedTime, BlockType bloc);
-    void DisplaySingleOrMultiplayerMenu();
     void DrawHud(float elapsedTime, BlockType bloc);
+    void DisplayInfo(float elapsedTime, BlockType bloc);
+
+    void DisplaySplashScreen();
+
+    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);
 
-    World m_world = World();
+    TextureAtlas::TextureIndex texBoostHeal;
-    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;
 
-    TextureAtlas::TextureIndex texBoostHeal;
+    Texture m_textureLobbyMenu;
+    Texture m_textureMainMenu;
+    Texture m_textureOptionsMenu;
+    Texture m_texturePauseMenu;
+    Texture m_textureSplashScreen;
 
-    Skybox m_skybox;
+    Texture m_textureHd;
-    Audio m_audio = Audio(AUDIO_PATH "start.wav");
+    Texture m_textureFhd;
+    Texture m_textureQhd;
+    Texture m_textureUhd;
 
-    irrklang::ISound* m_powpow,
+    Texture m_textureLobbyServer;
-        * m_scream;
+    Texture m_textureLobbyIdentify;
-    irrklang::ISound *m_whoosh[MAX_BULLETS];
+    Texture m_textureCheck;
+    Texture m_textureChecked;
 
-    Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f));
+    Texture m_textureOptAudio;
-    
+    Texture m_textureOptBack;
-    Bullet* m_bullets[MAX_BULLETS];
+    Texture m_textureOptGameplay;
+    Texture m_textureOptGraphics;
+    Texture m_textureOptMain;
+    Texture m_textureOptMusic;
+    Texture m_textureOptOptions;
+    Texture m_textureOptResolution;
+    Texture m_textureOptSensitivity;
+    Texture m_textureOptSfx;
 
-    std::unordered_map<uint64_t, Player*> m_players;
+    Texture m_textureMenuBack;
-    netprot::Buffer m_buf, m_bufout;
+    Texture m_textureMenuMulti;
-    std::chrono::high_resolution_clock::time_point m_startTime;
+    Texture m_textureMenuOptions;
+    Texture m_textureMenuPlay;
+    Texture m_textureMenuQuit;
+    Texture m_textureMenuSingle;
+    Texture m_textureMenuTitle;
 
-    //Menu
+    Settings m_options = Settings(m_audio);
-    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);
+    Resolution m_resolution = HD;
 
+    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;
@@ -144,31 +201,44 @@ private:
     bool m_resetcountdown = false;
     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", 800, 600, false);
+    engine.Start("Syndicat Quebecois de la Construction Simulator 2023", BASE_WIDTH, BASE_HEIGHT, false);
 }