Fair enough

Sqc 15 online

SQCSim-common/SQCSim-common.vcxproj

@@ -131,6 +131,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="booster.h" />
     <ClInclude Include="array2d.h" />
     <ClInclude Include="array3d.h" />
     <ClInclude Include="blockinfo.h" />
@@ -147,6 +148,7 @@
     <ClInclude Include="world.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="booster.cpp" />
     <ClCompile Include="blockinfo.cpp" />
     <ClCompile Include="boostinfo.cpp" />
     <ClCompile Include="bullet.cpp" />

SQCSim-common/SQCSim-common.vcxproj.filters

@@ -54,6 +54,9 @@
     <ClInclude Include="transformation.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
+    <ClInclude Include="booster.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
     <ClInclude Include="boostinfo.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
@@ -83,6 +86,9 @@
     <ClCompile Include="transformation.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
+    <ClCompile Include="booster.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
     <ClCompile Include="boostinfo.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>

SQCSim-common/booster.cpp

@@ -0,0 +1,39 @@
+#include "booster.h"
+
+Booster::Booster()
+{
+}
+
+Booster::Booster(Vector3f tpos, BOOST_TYPE ttype, uint64_t id): m_id(id), pos(tpos), type(ttype){}
+
+Booster::~Booster()
+{
+
+}
+
+Vector3f Booster::GetPosition()
+{
+	return pos;
+}
+
+BOOST_TYPE Booster::GetType()
+{
+	return type;
+}
+
+uint64_t Booster::GetId() const
+{
+	return m_id;
+}
+
+bool Booster::GetAvailability()
+{
+	return available;
+}
+
+void Booster::SetAvailability(bool value)
+{
+	available = value;
+	modified = true;
+}
+

SQCSim-common/booster.h

@@ -0,0 +1,23 @@
+#ifndef BOOSTER_H__
+#define BOOSTER_H__
+#include "define.h"
+#include "vector3.h"
+
+class Booster {
+public:
+	Booster();
+	Booster(Vector3f tpos, BOOST_TYPE ttype, uint64_t id);
+	~Booster();
+	Vector3f GetPosition();
+	BOOST_TYPE GetType();
+	uint64_t GetId() const;
+	bool GetAvailability();
+	void SetAvailability(bool value);
+	bool modified = true;
+private:
+	Vector3f pos;
+	BOOST_TYPE type;
+	uint64_t m_id;
+	bool available = true;
+};
+#endif

SQCSim-common/bullet.cpp

@@ -3,19 +3,45 @@
 
 Bullet::Bullet(Vector3f pos, Vector3f dir) : m_startpos(pos), m_currentpos(pos), m_velocity(dir) {}
 
-Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t tid): m_startpos(pos), m_currentpos(pos), m_velocity(dir), m_tid(tid) {}
+Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t shooter_id) : m_startpos(pos), m_currentpos(pos), m_velocity(dir), m_shooter_id(shooter_id) {}
+
+
+Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t shooter_id, bool canhurt): m_startpos(pos), m_currentpos(pos), m_velocity(dir), m_shooter_id(shooter_id), m_canhurt(canhurt) {}
 
 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;
+	Player* shooter = nullptr;
+	float damage = 0.098f;
+	if (mapPlayer.count(m_shooter_id)) {
+		shooter = mapPlayer.at(m_shooter_id);
+		damage = shooter->boostdamage ? 0.123f : 0.098f;
+	}
+
 	for (int x = 0; x < max; ++x) {
 		m_currentpos += m_velocity * elapsedtime;
 
 		for (auto& [key, player] : mapPlayer) {
-			if ((m_currentpos - player->GetPosition()).Length() < .4f) {
+			if (key == m_shooter_id)
+				continue;
+
+			bool hit = false;
+			if ((m_currentpos - player->GetPosition()).Length() < 1.5f) {
+				hit = true;
+			}
+			else if ((m_currentpos - player->GetPOV()).Length() < .7f) {
+				damage *= 2; // HEADSHOT!
+				hit = true;
+			}
+			if (hit && !player->AmIDead()) {
+				if (m_canhurt && !player->boostinvincible)
 					player->InflictDamage(damage);
+				player->m_hit = true;
+
+				if (player->AmIDead())
+					player->Killer = m_shooter_id;
+
 				return true;
 			}
 		}
@@ -23,7 +49,17 @@ 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 (m_canhurt) {
+				if (chunkmod) {
+					using namespace netprot;
+					*chunkmod = new ChunkMod();
+					(*chunkmod)->old_b_type = world->BlockAt(m_currentpos);
+					(*chunkmod)->b_type = BTYPE_AIR;
+					(*chunkmod)->pos = m_currentpos;
+				}
+
 				world->ChangeBlockAtPosition(BTYPE_AIR, m_currentpos);
+			}
 			return true;
 		}
 		else if ((m_currentpos - m_startpos).Length() > VIEW_DISTANCE) return true;
@@ -47,6 +83,6 @@ Vector3f Bullet::getVel() const {
 	return m_velocity;
 }
 
-uint64_t Bullet::getTeamID(){
+//uint64_t Bullet::getTeamID(){
-	return m_tid;
+//	return m_tid;
-}
+//}

SQCSim-common/bullet.h

@@ -5,7 +5,7 @@
 #include "define.h"
 #include "vector3.h"
 #include "player.h"
-
+#include "netprotocol.h"
 
 class World;
 class Player;
@@ -14,19 +14,22 @@ class Bullet {
 public:
 	Bullet(Vector3f pos, Vector3f dir);
 	Bullet(Vector3f pos, Vector3f dir, uint64_t tid);
+	Bullet(Vector3f pos, Vector3f dir, uint64_t tid, bool canhurt);
 	~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;
-	uint64_t getTeamID();
+	//uint64_t getTeamID();
 
 private:
 	Vector3f m_startpos, 
 			 m_currentpos, 
 			 m_velocity;
-	uint64_t m_tid = 0;
+	uint64_t m_shooter_id = 0;
+
+	bool m_canhurt = true;
 	
 
 };

SQCSim-common/define.h

@@ -31,18 +31,25 @@
 #define TEXTURE_SIZE 512
 #define MAX_BULLETS 512
 
+#define NB_BOOST 2
 #define TIME_SPEED_BOOST 10		//secondes
 #define TIME_DAMAGE_BOOST 10	//secondes
 #define TIME_INVINCIBLE_BOOST 4	//secondes
-#define STRENGTH_SPEED_BOOST 10	//Pourcentage
+#define STRENGTH_SPEED_BOOST 1000	//Pourcentage
-#define BULLET_TIME .1
+#define BULLET_TIME .2 //secondes
+
+#define SYNC_ACC 600  // ms
+#define CMOD_ACC 1000  // ms
 
 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
@@ -74,6 +81,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));
 
@@ -181,8 +181,6 @@ void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
 
 	memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) + 1, ammo8, sizeof(uint16_t));
 
-	memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t) + 1, &sync->hp, sizeof(uint8_t));
-
 	uint32_t vec[3];
 	memcpy(vec, &sync->position, sizeof(Vector3f)); // Pour d<>naturer les floats.
 
@@ -200,9 +198,28 @@ void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
 					(uint8_t)((vec[2] >> 8) & 0xFF),
 					 (uint8_t)(vec[2] & 0xFF) };
 
-	memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t) + 2, vec8, sizeof(uint32_t) * 3);
+	memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t) + 1, vec8, sizeof(uint32_t) * 3);
 
-	*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + 2;
+	uint32_t hp;
+
+	memcpy(&hp, &sync->hp, sizeof(float));
+
+	uint8_t hp8[4] = {
+					(uint8_t)((hp >> 24) & 0xFF),
+					(uint8_t)((hp >> 16) & 0xFF),
+					(uint8_t)((hp >> 8) & 0xFF),
+					(uint8_t)(hp & 0xFF) };
+
+	memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + 1, hp8, sizeof(float));
+
+	Boosts boost = sync->boost;
+	uint8_t boost8 = // Reste 6 bits.
+		(boost.invincible ? 0b10000000 : 0) |
+		(boost.damage ? 0b01000000 : 0);
+
+	memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 5 + sizeof(uint16_t) + 1, &boost8, sizeof(uint8_t));
+
+	*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 5 + sizeof(uint16_t) + sizeof(float) + 2;
 }
 
 void netprot::Serialize(TeamInfo* tinfo, char* buf[], uint32_t* buflen) {
@@ -210,7 +227,8 @@ void netprot::Serialize(TeamInfo* tinfo, char* buf[], uint32_t* buflen) {
 
 	size_t namesize = std::strlen(tinfo->name) + 1;
 
-	memcpy(*buf + 1, &tinfo->name, namesize);
+	strcpy(*buf + 1, namesize, tinfo->name);
+
 	uint64_t tid = tinfo->id;
 	uint8_t tid8[sizeof(uint64_t)] = {
 									   (uint8_t)((tid >> 56) & 0xFF),
@@ -233,7 +251,8 @@ void netprot::Serialize(LoginInfo* linfo, char* buf[], uint32_t* buflen) {
 
 	size_t namesize = std::strlen(linfo->name) + 1;
 
-	memcpy(*buf + 1, &linfo->name, namesize);
+	strcpy(*buf + 1, namesize, linfo->name);
+
 	uint64_t sid = linfo->sid;
 	uint8_t sid8[sizeof(uint64_t)] = {
 									   (uint8_t)((sid >> 56) & 0xFF),
@@ -270,7 +289,8 @@ void netprot::Serialize(PlayerInfo* pinfo, char* buf[], uint32_t* buflen) {
 
 	size_t namesize = std::strlen(pinfo->name) + 1;
 
-	memcpy(*buf + 1, &pinfo->name, namesize);
+	strcpy(*buf + 1, namesize, pinfo->name);
+
 	uint64_t id = pinfo->id;
 	uint8_t id8[sizeof(uint64_t)] = {
 									   (uint8_t)((id >> 56) & 0xFF),
@@ -397,11 +417,157 @@ void netprot::Serialize(Chat* chat, char* buf[], uint32_t* buflen) {
 
 	size_t messize = std::strlen(chat->mess) + 1;
 
-	memcpy(*buf + 1 + sizeof(uint64_t) * 3, &chat->mess, messize);
+	strcpy(*buf + 1 + sizeof(uint64_t) * 3, messize, chat->mess);
 
 	*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(BulletAdd* bull, char* buf[], uint32_t* buflen) {
+	*buf[0] = (char)netprot::PACKET_TYPE::BULLET;
+
+	uint64_t tstamp = bull->tstamp;
+	uint8_t ts8[sizeof(uint64_t)] = {
+									   (uint8_t)((tstamp >> 56) & 0xFF),
+									   (uint8_t)((tstamp >> 48) & 0xFF),
+									   (uint8_t)((tstamp >> 40) & 0xFF),
+									   (uint8_t)((tstamp >> 32) & 0xFF),
+									   (uint8_t)((tstamp >> 24) & 0xFF),
+									   (uint8_t)((tstamp >> 16) & 0xFF),
+									   (uint8_t)((tstamp >> 8) & 0xFF),
+										(uint8_t)(tstamp & 0xFF)
+	};
+
+	memcpy(*buf + 1, ts8, sizeof(uint64_t));
+
+	uint64_t tid = bull->id;
+	uint8_t tid8[sizeof(uint64_t)] = {
+									   (uint8_t)((tid >> 56) & 0xFF),
+									   (uint8_t)((tid >> 48) & 0xFF),
+									   (uint8_t)((tid >> 40) & 0xFF),
+									   (uint8_t)((tid >> 32) & 0xFF),
+									   (uint8_t)((tid >> 24) & 0xFF),
+									   (uint8_t)((tid >> 16) & 0xFF),
+									   (uint8_t)((tid >> 8) & 0xFF),
+										(uint8_t)(tid & 0xFF)
+	};
+
+	memcpy(*buf + 1 + sizeof(uint64_t), tid8, sizeof(uint64_t));
+
+	uint32_t vec[3];
+	memcpy(vec, &bull->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 + sizeof(uint64_t) * 2, vec8, sizeof(uint32_t) * 3);
+
+	memcpy(vec, &bull->dir, sizeof(Vector3f)); // Pour d<>naturer les floats.
+
+	uint8_t dir8[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 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 3, dir8, sizeof(uint32_t) * 3);
+
+	*buflen = 1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 6;
+}
+
+void netprot::Serialize(PickupMod* pmod, char* buf[], uint32_t* buflen) {
+	*buf[0] = (char)netprot::PACKET_TYPE::PICKUPMOD;
+
+	uint64_t id = pmod->id;
+	uint8_t id8[sizeof(uint64_t)] = { (uint8_t)((id >> 56) & 0xFF),
+									   (uint8_t)((id >> 48) & 0xFF),
+									   (uint8_t)((id >> 40) & 0xFF),
+									   (uint8_t)((id >> 32) & 0xFF),
+									   (uint8_t)((id >> 24) & 0xFF),
+									   (uint8_t)((id >> 16) & 0xFF),
+									   (uint8_t)((id >> 8) & 0xFF),
+										(uint8_t)(id & 0xFF) };
+
+	memcpy(*buf + 1, id8, sizeof(uint64_t));
+
+	uint32_t vec[3];
+	memcpy(vec, &pmod->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 + sizeof(uint64_t) + 2, vec8, sizeof(uint32_t) * 3);
+
+	Boosts boost = pmod->boost;
+	uint8_t boost8 = // Reste 5 bits.
+		(boost.invincible ? 0b10000000 : 0) |
+		(boost.damage ? 0b01000000 : 0) |
+		(boost.hp ? 0b00100000 : 0);
+
+	memcpy(*buf + sizeof(uint64_t) + sizeof(uint32_t) * 3 + 1, &boost8, sizeof(uint8_t));
+
+	memcpy(*buf + 2 + sizeof(uint64_t) + sizeof(uint32_t) * 3, &pmod->available, sizeof(bool));
+
+	*buflen = 2 + sizeof(uint64_t) + sizeof(uint32_t) * 3 + 3;
+}
+
 void netprot::Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen) {
 	*buf[0] = (char)netprot::PACKET_TYPE::ERRLOG;
 
@@ -416,7 +582,8 @@ void netprot::Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen) {
 
 
 
-bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
+
+bool netprot::Deserialize(Input* in, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(Input))
 		return false;
 
@@ -476,7 +643,7 @@ bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(Output* out, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(Output* out, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(Output))
 		return false;
 
@@ -508,10 +675,12 @@ bool netprot::Deserialize(Output* out, char* buf, uint32_t *buflen) {
 	out->states.jumping = states & 0b10000000;
 	out->states.shooting = states & 0b01000000;
 	out->states.hit = states & 0b00100000;
-	out->states.dead = states & 0b00010000;
+	out->states.powerup = states & 0b00010000;
-	out->states.still = states & 0b00001000;
+	out->states.dead = states & 0b00001000;
-	out->states.jumpshot = states & 0b00000100;
+	out->states.still = states & 0b00000100;
-	out->states.running = states & 0b00000010;
+	out->states.jumpshot = states & 0b00000010;
+	out->states.running = states & 0b00000001;
+
 
 	uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
 	memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2], sizeof(uint8_t) * 12);
@@ -553,7 +722,7 @@ bool netprot::Deserialize(Output* out, char* buf, uint32_t *buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(Sync* sync, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(Sync))
 		return false;
 
@@ -592,10 +761,9 @@ bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
 		(uint16_t)diff[0] << 8 |
 		(uint16_t)diff[1];
 
-	memcpy(&sync->hp, &buf[1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t)], sizeof(uint8_t));
 
 	uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
-	memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t)], sizeof(uint8_t) * 12);
+	memcpy(subvec, &buf[1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t)], sizeof(uint8_t) * 12);
 	uint32_t vec[3] = {
 		(uint32_t)subvec[0] << 24 |
 		(uint32_t)subvec[1] << 16 |
@@ -612,12 +780,28 @@ bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
 
 	memcpy(&sync->position, vec, sizeof(uint32_t) * 3);
 
-	*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + 2;
+	uint8_t hp8[4];
+
+	memcpy(&hp8, &buf[1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t)], sizeof(uint32_t));
+
+	uint32_t hp = (uint32_t)hp8[0] << 24 |
+		(uint32_t)hp8[1] << 16 |
+		(uint32_t)hp8[2] << 8 |
+		(uint32_t)hp8[3];
+
+	memcpy(&sync->hp, &hp, sizeof(float));
+
+	uint8_t boost = 0;
+	memcpy(&boost, &buf[2 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 5 + sizeof(uint16_t)], sizeof(uint8_t));
+	sync->boost.invincible = boost & 0b10000000;
+	sync->boost.damage = boost & 0b01000000;
+
+	*buflen = 2 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 5 + sizeof(uint16_t) + sizeof(float);
 
 	return true;
 }
 
-bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(LoginInfo))
 		return false;
 
@@ -626,7 +810,7 @@ bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
 	if (namesize > 32)
 		return false;
 
-	memcpy(&tinfo->name, &buf[1], namesize);
+	strcpy(tinfo->name, namesize, &buf[1]);
 
 	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
 	memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));
@@ -645,7 +829,7 @@ bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(LoginInfo))
 		return false;
 
@@ -654,7 +838,7 @@ bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
 	if (namesize > 32)
 		return false;
 
-	memcpy(&linfo->name, &buf[1], namesize);
+	strcpy(linfo->name, namesize, &buf[1]);
 
 	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
 	memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));
@@ -684,7 +868,7 @@ bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(PlayerInfo))
 		return false;
 
@@ -693,7 +877,7 @@ bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
 	if (namesize > 32)
 		return false;
 
-	memcpy(&pinfo->name, &buf[1], namesize);
+	strcpy(pinfo->name, namesize, &buf[1]);
 
 	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
 	memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));
@@ -723,7 +907,7 @@ bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(GameInfo))
 		return false;
 
@@ -766,7 +950,7 @@ bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t *buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(Chat* chat, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(Chat* chat, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(Chat))
 		return false;
 
@@ -806,19 +990,119 @@ bool netprot::Deserialize(Chat* chat, char* buf, uint32_t *buflen) {
 		(uint64_t)dstt[6] << 8 |
 		(uint64_t)dstt[7];
 
-	size_t messsize = std::strlen(buf + sizeof(uint64_t) * 3) + 1;
+	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);
+	char* ciboire = &buf[1 + sizeof(uint64_t) * 3];
 
-	*buflen = messsize + sizeof(uint64_t) * 3 + 2;
+	strcpy(chat->mess, 140, ciboire);
+
+	//*buflen = messsize + sizeof(uint64_t) * 3 + 1;
 
 	return true;
 }
 
-bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t *buflen) {
+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(BulletAdd* bull, char* buf, uint32_t* buflen) {
+	if (*buflen <= sizeof(BulletAdd))
+		return false;
+
+	uint8_t tst[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
+	memcpy(tst, &buf[1], sizeof(uint64_t));
+	bull->tstamp =
+		(uint64_t)tst[0] << 56 |
+		(uint64_t)tst[1] << 48 |
+		(uint64_t)tst[2] << 40 |
+		(uint64_t)tst[3] << 32 |
+		(uint64_t)tst[4] << 24 |
+		(uint64_t)tst[5] << 16 |
+		(uint64_t)tst[6] << 8 |
+		(uint64_t)tst[7];
+
+	memcpy(tst, &buf[1 + sizeof(uint64_t)], sizeof(uint64_t));
+	bull->id =
+		(uint64_t)tst[0] << 56 |
+		(uint64_t)tst[1] << 48 |
+		(uint64_t)tst[2] << 40 |
+		(uint64_t)tst[3] << 32 |
+		(uint64_t)tst[4] << 24 |
+		(uint64_t)tst[5] << 16 |
+		(uint64_t)tst[6] << 8 |
+		(uint64_t)tst[7];
+
+	uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
+	memcpy(subvec, &buf[1 + sizeof(uint64_t) * 2], sizeof(uint8_t) * 12);
+	uint32_t vec[3] = {
+		(uint32_t)subvec[0] << 24 |
+		(uint32_t)subvec[1] << 16 |
+		(uint32_t)subvec[2] << 8 |
+		(uint32_t)subvec[3],
+			(uint32_t)subvec[4] << 24 |
+			(uint32_t)subvec[5] << 16 |
+			(uint32_t)subvec[6] << 8 |
+			(uint32_t)subvec[7],
+				(uint32_t)subvec[8] << 24 |
+				(uint32_t)subvec[9] << 16 |
+				(uint32_t)subvec[10] << 8 |
+				(uint32_t)subvec[11] };
+
+	memcpy(&bull->pos, vec, sizeof(uint32_t) * 3);
+
+	memcpy(subvec, &buf[1 + sizeof(uint64_t) * 2 + sizeof(uint8_t) * 12], sizeof(uint8_t) * 12);
+
+	uint32_t dir[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(&bull->dir, dir, sizeof(uint32_t) * 3);
+
+	*buflen = 1 + sizeof(uint64_t) * 2 + sizeof(uint8_t) * 24;
+
+	return true;
+}
+
+bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(ErrorLog))
 		return false;
 
@@ -835,6 +1119,53 @@ bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t *buflen) {
 	return true;
 }
 
+bool netprot::Deserialize(PickupMod* pmod, char* buf, uint32_t* buflen) {
+	if (*buflen <= sizeof(PickupMod))
+		return false;
+
+	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
+	memcpy(diff, &buf[1], sizeof(uint64_t));
+	pmod->id =
+		(uint64_t)diff[0] << 56 |
+		(uint64_t)diff[1] << 48 |
+		(uint64_t)diff[2] << 40 |
+		(uint64_t)diff[3] << 32 |
+		(uint64_t)diff[4] << 24 |
+		(uint64_t)diff[5] << 16 |
+		(uint64_t)diff[6] << 8 |
+		(uint64_t)diff[7];
+
+	uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
+	memcpy(subvec, &buf[2 + sizeof(uint64_t)], sizeof(uint8_t) * 12);
+	uint32_t vec[3] = {
+		(uint32_t)subvec[0] << 24 |
+		(uint32_t)subvec[1] << 16 |
+		(uint32_t)subvec[2] << 8 |
+		(uint32_t)subvec[3],
+			(uint32_t)subvec[4] << 24 |
+			(uint32_t)subvec[5] << 16 |
+			(uint32_t)subvec[6] << 8 |
+			(uint32_t)subvec[7],
+				(uint32_t)subvec[8] << 24 |
+				(uint32_t)subvec[9] << 16 |
+				(uint32_t)subvec[10] << 8 |
+				(uint32_t)subvec[11] };
+
+	memcpy(&pmod->pos, vec, sizeof(uint32_t) * 3);
+
+	uint8_t boosts = 0;
+	memcpy(&boosts, &buf[1 + sizeof(uint64_t) + sizeof(uint32_t) * 3], sizeof(uint8_t));
+	pmod->boost.invincible = boosts & 0b10000000;
+	pmod->boost.damage = boosts & 0b01000000;
+	pmod->boost.hp = boosts & 0b00100000;
+
+	memcpy(&pmod->available, &buf[2 + sizeof(uint64_t) + sizeof(uint32_t) * 3], sizeof(bool));
+
+	*buflen = 3 + sizeof(uint64_t) + sizeof(uint32_t) * 3;
+
+	return true;
+}
+
 
 
 netprot::PACKET_TYPE netprot::getType(char* buf, const uint32_t buflen) {
@@ -845,7 +1176,7 @@ netprot::PACKET_TYPE netprot::getType(char* buf, const uint32_t buflen) {
 	return (netprot::PACKET_TYPE)buf[0];
 }
 
-netprot::Packet netprot::getPack(char* buf, uint32_t *buflen) {
+netprot::Packet netprot::getPack(char* buf, uint32_t* buflen) {
 	Packet pck = { nullptr, PACKET_TYPE::ERR };
 	Input* in = nullptr;
 	Output* out = nullptr;
@@ -911,9 +1242,7 @@ netprot::Packet netprot::getPack(char* buf, uint32_t *buflen) {
 	return pck;
 }
 
-netprot::Packet netprot::getPack(netprot::Buffer* buf) {
+netprot::Packet netprot::getPack(netprot::Buffer* buf) { return netprot::getPack(buf->ptr, &buf->len); }
-	return netprot::getPack(buf->ptr, &buf->len);
-}
 
 bool netprot::emptyPack(netprot::Packet pck) {
 	switch (pck.type) {
@@ -950,13 +1279,12 @@ netprot::Packet netprot::makePack(void* ptr, PACKET_TYPE type) {
 	return pck;
 }
 
-std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf) {
+void netprot::recvPacks(SOCKET sock, Buffer* buf, std::vector<char*>* lsPck) {
-	std::vector<char*> lsPck;
+	int len = buf->tmp ? buf->tmp - buf->ptr : 0,
-	int len = buf->tmp? buf->tmp - buf->ptr: 0, 
 		end = 0;
-	char * cursor = buf->tmp ? buf->tmp: nullptr ,
+	char* cursor = buf->tmp ? buf->tmp : nullptr,
-		 * next = buf->tmp ? buf->tmp + 1: buf->ptr, 
+		* next = buf->tmp ? buf->tmp + 1 : buf->ptr,
-		 * last = buf->tmp ? buf->tmp: buf->ptr;
+		* last = buf->tmp ? buf->tmp : buf->ptr;
 	bool ended = true;
 	struct pollfd fds[1];
 
@@ -967,14 +1295,14 @@ std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf)
 		if (!poll(fds, 1, 0)) {
 			if (ended)
 				buf->tmp = nullptr;
-			return lsPck;
+			return;
 		}
 
 		int bytes = recv(sock, &buf->ptr[len], buf->len - len, 0);
 		if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
 			if (ended)
 				buf->tmp = nullptr;
-			return lsPck;
+			return;
 		}
 		len += bytes;
 		end = len;
@@ -998,23 +1326,13 @@ std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf)
 
 				cmp = memcmp(cursor, Footer, sizeof(uint32_t));
 				if (cmp == 0) {
-					if (!outbuf) {
+					lsPck->push_back(last);
-						lsPck.push_back(last);
-						cursor += sizeof(uint32_t);
-						last = cursor;
-						next = cursor + 1;
-					}
-					else {
-						memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
-						lsPck.push_back(&outbuf->ptr[cursor - last]);
 					cursor += sizeof(uint32_t);
 					last = cursor;
 					next = cursor + 1;
 				}
 			}
-			}
 			else {
-				if (!outbuf)
 				buf->tmp = last;
 				cursor = &buf->ptr[len];
 				next = cursor + 1;
@@ -1024,8 +1342,7 @@ std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf)
 	}
 }
 
-std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* outbuf) {
+void netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, std::vector<char*>* lsPck) {
-	std::vector<char*> lsPck;
 	int len = buf->tmp ? buf->tmp - buf->ptr : 0,
 		end = 0;
 	char* cursor = buf->tmp ? buf->tmp : nullptr,
@@ -1043,14 +1360,14 @@ std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in
 		if (!poll(fds, 1, 0)) {
 			if (ended)
 				buf->tmp = nullptr;
-			return lsPck;
+			return;
 		}
 
 		int bytes = recvfrom(sock, &buf->ptr[len], buf->len - len, 0, (sockaddr*)&sockad, &socklen);
 		if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
 			if (ended)
 				buf->tmp = nullptr;
-			return lsPck;
+			return;
 		}
 		len += bytes;
 		end = len;
@@ -1074,23 +1391,13 @@ std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in
 
 				cmp = memcmp(cursor, Footer, sizeof(uint32_t));
 				if (cmp == 0) {
-					if (!outbuf) {
+					lsPck->push_back(last);
-						lsPck.push_back(last);
-						cursor += sizeof(uint32_t);
-						last = cursor;
-						next = cursor + 1;
-					}
-					else {
-						memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
-						lsPck.push_back(&outbuf->ptr[cursor - last]);
 					cursor += sizeof(uint32_t);
 					last = cursor;
 					next = cursor + 1;
 				}
 			}
-			}
 			else {
-				if (!outbuf)
 				buf->tmp = last;
 				cursor = &buf->ptr[len];
 				next = cursor + 1;

SQCSim-common/netprotocol.h

@@ -12,14 +12,14 @@ namespace netprot {
 				ERR, INPUT, OUTPUT, SYNC,
 				TEAMINF, SELFINF, PLAYINF, LOGINF,
 				CHUNKMOD, PLAYERMOD, PICKUPMOD,
-				GAMEINFO, ENDINFO , CHAT, ERRLOG,
+				GAMEINFO, ENDINFO , BULLET,
-				LAST_PACK
+				CHAT, ERRLOG, LAST_PACK
 			};
 
 	/* Structures */
 	
 	struct Buffer { // Pour pouvoir rendre l'utilisation des buffers plus clean.
-		char* ptr = new char[BUFFER_LENGTH] { 1 }, * tmp = nullptr;
+		char *ptr = new char[BUFFER_LENGTH] { 1 }, *tmp = nullptr;
 		uint32_t len = BUFFER_LENGTH;
 
 		~Buffer() { delete[] ptr; }
@@ -27,7 +27,7 @@ namespace netprot {
 	};
 
 	struct Packet { // Pour pouvoir recevoir les paquets du recv() sans avoir à les aiguiller dans la même thread.
-		void* ptr = nullptr; // Notez que le pointeur doit être supprimé séparément lorsqu'il n'est plus utile.
+		void *ptr = nullptr; // Notez que le pointeur doit être supprimé séparément lorsqu'il n'est plus utile.
 		PACKET_TYPE type = PACKET_TYPE::ERR;
 	};
 
@@ -38,24 +38,30 @@ namespace netprot {
 	/* Sous-structures */
 
 	struct Keys {
-		bool forward, 
+		bool forward = false,
-			 backward, 
+			backward = false,
-			 left, 
+			left = false,
-			 right, 
+			right = false,
-			 jump, 
+			jump = false,
-			 shoot,
+			shoot = false,
-			 block;
+			block = false;
 	};
 
 	struct States {
-		bool jumping, 
+		bool jumping = false,
-			 shooting, 
+			shooting = false,
-			 hit, 
+			hit = false,
-			 powerup,
+			powerup = false,
-			 dead,
+			dead = false,
-			 still,
+			still = false,
-		     jumpshot,
+			jumpshot = false,
-			 running;
+			running = false;
+	};
+
+	struct Boosts {
+		bool invincible = false,
+			damage = false,
+			hp = false;
 	};
 
 	/* Structures de paquets */
@@ -80,37 +86,38 @@ namespace netprot {
 		uint64_t sid = 0;
 		uint32_t timer = 0;
 		uint16_t ammo = 0;
-		uint8_t hp = 0;
+		Boosts boost;
+		float hp = 0;
 		Vector3f position;
 		Sync() {}
-		Sync(Sync* sync) : timestamp(sync->timestamp), sid(sync->sid), timer(sync->timer), ammo(sync->ammo), hp(sync->hp), position(sync->position) {}
+		Sync(Sync* sync) : timestamp(sync->timestamp), sid(sync->sid), timer(sync->timer), ammo(sync->ammo), hp(sync->hp), position(sync->position), boost(sync->boost) {}
 	};
 
 	struct TeamInfo {									// cli <-> srv			TCP			once
-		char name[32];
+		char *name = new char[32];
 		uint64_t id = 0;
 		TeamInfo() {}
-		TeamInfo(TeamInfo* tem) : id(tem->id) { strcpy(tem->name, name); }
+		TeamInfo(TeamInfo* tem) : id(tem->id) { strcpy(name, 32, tem->name); }
+		~TeamInfo() { delete[] name; }
 	};
 
 	struct LoginInfo {									// cli <-> srv			TCP			once
-		char name[32];
+		char *name = new char[32];
 		uint64_t sid = 0, 
 			     tid = 0;
 		LoginInfo() {}
-		LoginInfo(LoginInfo* ply): sid(ply->sid), tid(ply->tid) { strcpy(ply->name, name); }
+		LoginInfo(LoginInfo* log): sid(log->sid), tid(log->tid) { strcpy(name, 32, log->name); }
+		~LoginInfo() { delete[] name; }
 	};
 
 	struct PlayerInfo {									// cli <-> srv			TCP			once
-		char name[32];
+		char *name = new char[32];
 		uint64_t id = 0,
 				 tid = 0;
 		PlayerInfo() {}
-		PlayerInfo(PlayerInfo* log) : id(log->id), tid(log->tid) {
+		PlayerInfo(PlayerInfo* ply) : id(ply->id), tid(ply->tid) { strcpy(name, 32, ply->name); };
-			strcpy(log->name, name);
+		PlayerInfo(int id, int tid, std::string strname) : id(id), tid(tid) { strcpy(name, 32, strname.c_str()); }
-		};
+		~PlayerInfo() { delete[] name; }
-		PlayerInfo(int id, int tid, std::string strname) : id(id), tid(tid) { memcpy((void*)strname.c_str(), name, strname.length());
-		}
 	};
 
 	struct GameInfo {									// cli <-> srv			TCP			event (before game start)/ once
@@ -121,20 +128,42 @@ namespace netprot {
 		GameInfo(GameInfo* gam) : seed(gam->seed), countdown(gam->countdown), gameType(gam->gameType) {}
 	};
 
+	struct PickupMod {
+		uint64_t id;
+		Vector3f pos;
+		Boosts boost;
+		bool available = true;
+		PickupMod() {}
+		PickupMod(PickupMod* pmod) : id(pmod->id), pos(pmod->pos), boost(pmod->boost), available(pmod->available) {}
+	};
+
 	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.
+		char *mess = new char[140]; // Good 'nough for twitr, good 'nough for me.
 		Chat() {}
-		Chat(Chat* cha) : src_id(cha->src_id), dest_id(cha->dest_id), dest_team_id(cha->dest_team_id) { strcpy(cha->mess, mess); }
+		Chat(Chat* cha) : src_id(cha->src_id), dest_id(cha->dest_id), dest_team_id(cha->dest_team_id) { strcpy(mess, 140, cha->mess); }
+		~Chat() { delete[] mess; }
+	};
+
+	struct ChunkMod {
+		Vector3f pos;
+		BlockType b_type, old_b_type;
+	};
+
+	struct BulletAdd {
+		Timestamp tstamp;
+		Vector3f pos, dir;
+		uint64_t id;
 	};
 
 	struct ErrorLog {									// srv -> cli			TCP			event
-		char mess[140];
+		char *mess = new char[140];
-		bool is_fatal;
+		bool is_fatal = false;
 		ErrorLog() {};
-		ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(err->mess, mess); }
+		ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(mess, 140, err->mess); }
+		~ErrorLog() { delete[] mess; }
 	};
 
 	/* Fonctions */
@@ -147,6 +176,9 @@ 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(PickupMod* chmod, char* buf[], uint32_t* buflen); // srv
+	void Serialize(BulletAdd* bull, 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 +189,9 @@ 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(PickupMod* chmod, char* buf, uint32_t* buflen); // cli
+	bool Deserialize(BulletAdd* bull, char* buf, uint32_t* buflen); // cli
 	bool Deserialize(ErrorLog* errlog, char* buf, uint32_t* buflen); // srv
 
 	PACKET_TYPE getType(char* buf, uint32_t buflen);
@@ -176,8 +211,8 @@ namespace netprot {
 	template <class T> void sendPack(SOCKET sock, T* pack, Buffer* buf);
 	template <class T> void sendPackTo(SOCKET sock, T* pack, Buffer* buf, sockaddr_in* sockad);
 	
-	std::vector<char*> recvPacks(SOCKET sock, Buffer* buf, Buffer* oufbuf = nullptr);
+	void recvPacks(SOCKET sock, Buffer* buf, std::vector<char*>* lsPck);
-	std::vector<char*> recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* oufbuf = nullptr);
+	void recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, std::vector<char*>* lsPck);
 
 	/* Templates */
 

SQCSim-common/player.cpp

@@ -4,27 +4,17 @@
 Player::Player(const Vector3f& position, float rotX, float rotY) : m_position(position), m_rotX(rotX), m_rotY(rotY) {
 	m_velocity = Vector3f(0, 0, 0);
 	m_airborne = true;
-	m_hp = 1.0f; //TODO: Remettre <20> 1.0f
+	m_hp = 1.0f;
+	m_sensitivity = 0.5f;
 	m_username = "Zelda Bee-Bop56";
 }
 
 Player::~Player() {}
 
-void Player::TurnLeftRight(float value) {
+void Player::TurnLeftRight(float value, float sensitivity) {
-	m_rotY += value;
+	m_rotY += value * sensitivity;
 	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,31 +24,52 @@ 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, float sensitivity) {
+	m_rotX += value * sensitivity;
+	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();
 	delta.x *= .6f;
 	delta.z *= .6f;
 
-	if ((jump || shoot ) && !m_airborne) {
+	if ((jump || shoot) && !m_airborne) {
-		delta.y += jump? .32f: shoot? .1f : 0.f;
+		delta.y += jump ? .32f : shoot ? .1f : 0.f;
 		m_airborne = true;
 	}
 	if (boostspeed)
@@ -68,7 +79,7 @@ Vector3f Player::GetInput(bool front, bool back, bool left, bool right, bool jum
 	}
 
 	if (shoot) // Recoil!
-		TurnTopBottom(-1);
+		TurnTopBottom(-1, 1.0f);
 
 	return delta;
 }
@@ -112,32 +123,18 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
 	bt1 = world->BlockAt(GetPosition().x + input.x, GetPosition().y, GetPosition().z);
 	bt2 = world->BlockAt(GetPosition().x + input.x, GetPosition().y - 0.9f, GetPosition().z);
 	bt3 = world->BlockAt(GetPosition().x + input.x, GetPosition().y - 1.7f, GetPosition().z);
-	if (bt1 == BTYPE_AIR && bt2 != BTYPE_AIR && bt3 != BTYPE_AIR) {
+	if (bt1 != BTYPE_AIR || bt2 != BTYPE_AIR || bt3 != BTYPE_AIR) {
-		if (input.x > 0)
+		m_velocity.y += .04f;
-			input.x = m_velocity.x = 0.5f;
-		else
-			input.x = m_velocity.x = -0.5f;
-		m_velocity.y = 0.3;
-		m_velocity.z *= .5f;
-	}
-	else if (bt1 != BTYPE_AIR || bt2 != BTYPE_AIR || bt3 != BTYPE_AIR) {
-		input.x = m_velocity.x = 0;
 		m_velocity.z *= .5f;
+		m_velocity.x *= .5f;
 	}
 
 	bt1 = world->BlockAt(GetPosition().x, GetPosition().y, GetPosition().z + input.z);
 	bt2 = world->BlockAt(GetPosition().x, GetPosition().y - 0.9f, GetPosition().z + input.z);
 	bt3 = world->BlockAt(GetPosition().x, GetPosition().y - 1.7f, GetPosition().z + input.z);
-	if (bt1 == BTYPE_AIR && bt2 != BTYPE_AIR && bt3 != BTYPE_AIR) {
+	if (bt1 != BTYPE_AIR || bt2 != BTYPE_AIR || bt3 != BTYPE_AIR) {
-		if (input.z > 0)
+		m_velocity.y += .04f;
-			input.z = m_velocity.z = 0.5f;
+		m_velocity.z *= .5f; 
-		else
-			input.z = m_velocity.z = -0.5f;
-		m_velocity.y = 0.3;
-		m_velocity.x *= .5f;
-	}
-	else if (bt1 != BTYPE_AIR || bt2 != BTYPE_AIR || bt3 != BTYPE_AIR) {
-		input.z = m_velocity.z = 0;
 		m_velocity.x *= .5f;
 	}
 
@@ -145,8 +142,8 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
 	/* Gestion de la friction */
 
 	if (!m_airborne) {
-		m_velocity.x += input.x * 2.f * elapsedTime;
+		m_velocity.x += input.x * (boostspeed ? 2.5f : 2.f) * elapsedTime;
-		m_velocity.z += input.z * 2.f * elapsedTime;
+		m_velocity.z += input.z * (boostspeed ? 2.5f : 2.f) * elapsedTime;
 
 		if (input.x == 0.f)
 			m_velocity.x *= .8f;
@@ -164,7 +161,7 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
 	/* Fin gestion de la friction */
 
 	float vy = m_velocity.y;
-	m_velocity.y = 1.f; // Padding pour limiter le x et z lors du Normalize().
+	m_velocity.y = boostspeed ? 0.f: 1.f; // Padding pour limiter le x et z lors du Normalize().
 	if (m_velocity.Length() >= 1.f) m_velocity.Normalize(); // Limiteur de vitesse en x/z.
 	m_velocity.y = 0;
 	if (m_velocity.Length() < .005f) m_velocity.Zero(); // Threshold en x/z.
@@ -191,33 +188,51 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
 	return snd;
 }
 
+void Player::Put(Vector3f pos) {
+	m_position = pos;
+}
+
 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)
+uint64_t Player::TakeBooster(std::unordered_map<uint64_t, Booster*> booster_table, float elapsedtime)
 {
-	if (boosttype == SPEED)
+	uint64_t boostid = 0;
+	Vector3f playerpos = GetPosition();
+	for (auto& [key, booster]: booster_table) {
+		Vector3f pos = booster->GetPosition();
+		if (booster->GetAvailability() && abs(playerpos.x - pos.x) <= 0.5f && abs(playerpos.y - pos.y) <= 1.0f && abs(playerpos.z - pos.z) <= 0.5f)
+		{
+			boostid = booster->GetId();
+			GetBooster(booster->GetType(), elapsedtime);
+			booster->SetAvailability(false);
+			break;
+		}
+	}
+	return boostid;
+}
+
+void Player::GetBooster(BOOST_TYPE boosttype, float elapsedtime)
+{
+	if (boosttype == BTYPE_SPEED)
 	{
 		boostspeed = true;
 		timeboostspeed = 0;
 	}
-	if (boosttype == HEAL)
+	if (boosttype == BTYPE_HEAL)
 	{
-		m_hp = 100;
+		m_hp = 1.0f;
 	}
-	if (boosttype == DAMAGE)
+	if (boosttype == BTYPE_DAMAGE)
 	{
 		boostdamage = true;
 		timeboostdamage = 0;
 	}
-	if (boosttype == INVINCIBLE)
+	if (boosttype == BTYPE_INVINCIBLE)
 	{
 		boostinvincible = true;
 		boostinvincible = 0;
@@ -228,26 +243,28 @@ void Player::RemoveBooster(float elapsedtime)
 	if (boostspeed)
 	{
 		timeboostspeed += elapsedtime;
-		if (timeboostspeed >= TIME_SPEED_BOOST)
+		if (timeboostspeed >= TIME_SPEED_BOOST && boostspeed == true)
 			boostspeed = false;
 	}
 	if (boostdamage)
 	{
-		timeboostdamage += elapsedtime;
+		if (timeboostdamage >= TIME_DAMAGE_BOOST && boostdamage == true)
-		if (timeboostdamage >= TIME_DAMAGE_BOOST)
 			boostdamage = false;
 	}
 	if (boostinvincible)
 	{
-		timeboostinvincible += elapsedtime;
+		if (timeboostinvincible >= TIME_INVINCIBLE_BOOST && boostinvincible == true)
-		if (timeboostinvincible >= TIME_INVINCIBLE_BOOST)
 			boostinvincible = false;
 	}
 }
 void Player::SetDirection(Vector3f dir) { m_direction = dir; }
 
+void Player::Move(Vector3f diff) { m_position -= diff; }
+
 Vector3f Player::GetPosition() const { return Vector3f(m_position.x + CHUNK_SIZE_X * WORLD_SIZE_X / 2, m_position.y, m_position.z + CHUNK_SIZE_Z * WORLD_SIZE_Y / 2); }
 
+Vector3f Player::GetPositionAbs() const { return m_position; }
+
 Vector3f Player::GetVelocity() const { return m_velocity; }
 
 Vector3f Player::GetPOV() const { return Vector3f(GetPosition().x, m_POV, GetPosition().z); }
@@ -256,32 +273,43 @@ Vector3f Player::GetDirection() const { return m_direction; }
 
 std::string Player::GetUsername() const { return m_username; }
 
+void Player::SetUsername(std::string username) {
+	m_username = username;
+}
+
+float Player::GetSensitivity() const {
+	return m_sensitivity;
+}
+
+void Player::SetSensitivity(float sensitivity) {
+	m_sensitivity = sensitivity;
+}
+
 float Player::GetHP() const { return m_hp; }
 
+void Player::SetHP(float hp) {
+	m_hp = hp;
+}
+
 void Player::Teleport(int& x, int& z) {
 	m_position.x -= x * CHUNK_SIZE_X;
 	m_position.z -= z * CHUNK_SIZE_Z;
 }
-bool Player::AmIDead()
+bool Player::GetIsAirborne() const { return m_airborne; }
-{
-	return m_hp <= 0;
-}
 
+bool Player::AmIDead() { return m_hp <= 0; }
 
-void Player::InflictDamage(float hitPoints)
+void Player::InflictDamage(float hitPoints) {
-{
-
 	m_hp -= hitPoints;
 
-
+	if (m_hp < 0)
-	if (AmIDead())
+		m_hp == 0;
-	{ // Quand le joueur est mort.
-
-
-
-	}
 }
 
+int Player::getScore() const { return m_score; }
+
+void Player::addPoint() { ++m_score; }
+
 
 uint64_t Player::getId() const { return id; }
 

SQCSim-common/player.h

@@ -2,8 +2,11 @@
 #define PLAYER_H__
 
 #include <cmath>
+#include <unordered_map>
 #include "transformation.h"
 #include "vector3.h"
+#include "booster.h"
+#include "define.h"
 
 
 class World; 
@@ -11,30 +14,51 @@ class World;
 class Player {
 public:
 	enum Sound { NOSOUND, STEP, FALL };
-	enum Booster { SPEED, HEAL, DAMAGE, INVINCIBLE };
+	//enum BoosterType { SPEED, HEAL, DAMAGE, INVINCIBLE };
 
 	Player(const Vector3f& position, float rotX = 0, float rotY = 0);
 	~Player();
 
-	void TurnLeftRight(float value);
+	void TurnLeftRight(float value, float sensitivity);
-	void TurnTopBottom(float value);
+	void TurnTopBottom(float value, float sensitivity);
 	Vector3f GetInput(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime);
 	Sound ApplyPhysics(Vector3f input, World* world, float elapsedTime);
-	void GetBooster(Booster boosttype);
+	uint64_t TakeBooster(std::unordered_map<uint64_t, Booster*> booster_table, float elapsedTime);
+	void GetBooster(BOOST_TYPE boosttype, float elapsedTime);
 	void RemoveBooster(float elapsedtime);
 	void ApplyTransformation(Transformation& transformation, bool rel = true, bool rot = true) const;
 
 	void SetDirection(Vector3f dir);
+	void Move(Vector3f diff);
 	Vector3f GetPosition() const;
+	Vector3f GetPositionAbs() const;
 	Vector3f GetDirection() const;
 	Vector3f GetVelocity() const;
 	Vector3f GetPOV() const;
 	std::string GetUsername() const;
+	void SetUsername(std::string username);
+	float GetSensitivity() const;
+	void SetSensitivity(float sensitivity);
 	float GetHP() const;
+	void SetHP(float hp);
 	void Teleport(int& x, int& z);
 
+	bool GetIsAirborne() const;
 	bool AmIDead();
 	void InflictDamage(float hitPoints);
+	int getScore() const;
+	void addPoint();
+	uint64_t Killer = 0;
+	std::string m_username;
+	bool m_hit = false;
+
+	bool Eulogy = false;
+
+	bool boostspeed = false;
+	bool boostdamage = false;
+	bool boostinvincible = false;
+
+	void Put(Vector3f pos);
 
 private:
 	uint64_t getId() const;
@@ -44,8 +68,8 @@ protected:
 	Vector3f m_velocity;
 	Vector3f m_direction;
 
-	std::string m_username;
 	uint64_t id = 0;
+	int m_score = 0;
 
 	float m_rotX = 0; 
 	float m_rotY = 0;
@@ -53,15 +77,11 @@ protected:
 	float timeboostspeed;
 	float timeboostdamage;
 	float timeboostinvincible;
+	float m_sensitivity;
 
 	float m_hp;
 
 	bool m_airborne;
-	bool boostspeed;
-	bool boostdamage;
-	bool boostinvincible;
-
-
 
 	Vector3f InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now);
 };

SQCSim-common/world.cpp

@@ -49,8 +49,6 @@ void World::RemoveChunk(int nbReduit)
 			if (x > WORLD_SIZE_X - nbReduit)
 				chk = m_chunks.Remove(x, y);
 
-			// TODO: MakeDirty() les voisins pour qu'ils se redessinent.
-
 			if (!chk)
 				continue;
 
@@ -167,33 +165,27 @@ void World::GetScope(unsigned int& x, unsigned int& y) {
 
 void World::Update(Bullet* bullets[MAX_BULLETS], const Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]) {
 	UpdateWorld(player_pos, blockinfo);
-	//TransposeWorld(player_pos, bullets);
 }
-//
-//void World::UpdateChunk(int& updates, unsigned int chx, unsigned int chy, BlockInfo* blockinfo[BTYPE_LAST]) {
-//	if (updates == 0 && ChunkAt(chx, 1, chy) &&
-//		ChunkAt(chx, 1, chy)->IsDirty()) {
-//		ChunkAt(chx, 1, chy)->Update(blockinfo, this);
-//		updates = FRAMES_UPDATE_CHUNKS;
-//	}
-//
-//}
 
-void World::ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block) {
+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 +211,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) {
@@ -254,7 +255,6 @@ void World::UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]
 	int side = 0;
 	int threads = 0;
 	std::future<Chunk*> genThList[THREADS_GENERATE_CHUNKS];
-	//std::future<void> delThList[THREADS_DELETE_CHUNKS];
 	
 	if (frameGenerate > 0) --frameGenerate;
 	if (frameUpdate > 0) --frameUpdate;
@@ -345,101 +345,6 @@ void World::UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]
 
 	side = 0;
 	threads = 0;
-
-	//if (!frameUpdate)
-	//	while (side * CHUNK_SIZE_X <= VIEW_DISTANCE * 2) {
-	//		int tx = -side, ty = -side;
-
-	//		for (; tx <= side; ++tx) {
-	//			if (frameUpdate)
-	//				break;
-	//			unsigned int chx = cx + tx * CHUNK_SIZE_X, chy = cy + ty * CHUNK_SIZE_Z;
-	//			if (ChunkAt(chx, 1, chy) &&
-	//				ChunkAt(chx, 1, chy)->IsDirty()) {
-	//				updateThList[threads++] =
-	//					std::async(std::launch::async,
-	//						[](Chunk* chunk, BlockInfo* blockinfo[BTYPE_LAST], World* world) {
-	//							chunk->Update(blockinfo, world); return chunk; }, ChunkAt(chx, 1, chy), blockinfo, this);
-	//				if (threads == THREADS_UPDATE_CHUNKS) frameUpdate = FRAMES_UPDATE_CHUNKS;
-	//			}
-	//		}
-	//		for (; ty <= side; ++ty) {
-	//			if (frameUpdate)
-	//				break;
-	//			unsigned int chx = cx + tx * CHUNK_SIZE_X, chy = cy + ty * CHUNK_SIZE_Z;
-	//			if (ChunkAt(chx, 1, chy) &&
-	//				ChunkAt(chx, 1, chy)->IsDirty()) {
-	//				updateThList[threads++] =
-	//					std::async(std::launch::async,
-	//						[](Chunk* chunk, BlockInfo* blockinfo[BTYPE_LAST], World* world) {
-	//							chunk->Update(blockinfo, world); return chunk; }, ChunkAt(chx, 1, chy), blockinfo, this);
-	//				if (threads == THREADS_UPDATE_CHUNKS) frameUpdate = FRAMES_UPDATE_CHUNKS;
-	//			}
-	//		}
-	//		for (; tx >= -side; --tx) {
-	//			if (frameUpdate)
-	//				break;
-	//			unsigned int chx = cx + tx * CHUNK_SIZE_X, chy = cy + ty * CHUNK_SIZE_Z;
-	//			if (ChunkAt(chx, 1, chy) &&
-	//				ChunkAt(chx, 1, chy)->IsDirty()) {
-	//				updateThList[threads++] =
-	//					std::async(std::launch::async,
-	//						[](Chunk* chunk, BlockInfo* blockinfo[BTYPE_LAST], World* world) {
-	//							chunk->Update(blockinfo, world); return chunk; }, ChunkAt(chx, 1, chy), blockinfo, this);
-	//				if (threads == THREADS_UPDATE_CHUNKS) frameUpdate = FRAMES_UPDATE_CHUNKS;
-	//			}
-	//		}
-	//		for (; ty >= -side; --ty) {
-	//			if (frameUpdate)
-	//				break;
-	//			unsigned int chx = cx + tx * CHUNK_SIZE_X, chy = cy + ty * CHUNK_SIZE_Z;
-	//			if (ChunkAt(chx, 1, chy) &&
-	//				ChunkAt(chx, 1, chy)->IsDirty()) {
-	//				updateThList[threads++] =
-	//					std::async(std::launch::async,
-	//						[](Chunk* chunk, BlockInfo* blockinfo[BTYPE_LAST], World* world) {
-	//							chunk->Update(blockinfo, world); return chunk; }, ChunkAt(chx, 1, chy), blockinfo, this);
-	//				if (threads == THREADS_UPDATE_CHUNKS) frameUpdate = FRAMES_UPDATE_CHUNKS;
-	//			}
-	//		}
-	//		if (frameUpdate)
-	//			break;
-	//		++side;
-	//	}
-
-	//if (threads > 0) {
-	//	for (int i = 0; i < threads; ++i) {
-	//		updateThList[i].wait();
-	//		Chunk* chunk = updateThList[i].get();
-	//		chunk->FlushMeshToVBO();
-	//	}
-	//}
-
-	threads = 0;
-
-	//int del = THREADS_DELETE_CHUNKS;
-	//while (!m_tbDeleted.empty() && del--) { // Moins rapide que le bout en dessous, mais -beaucoup- plus stable.
-	//	m_tbDeleted.back()->FlushVBO();
-	//	m_tbDeleted.back()->~Chunk();
-	//	m_tbDeleted.pop_back();
-	//}
-
-	/*while (!m_tbDeleted.empty() && !frameDelete) {
-		if (m_tbDeleted.back()) {
-			m_tbDeleted.back()->FlushVBO();
-			delThList[threads] =
-				std::async(std::launch::async,
-					[](Chunk* chunk) { delete chunk; }, m_tbDeleted.back());
-			m_tbDeleted.pop_back();
-			if (++threads > THREADS_DELETE_CHUNKS) frameDelete = FRAMES_DELETE_CHUNKS;
-		}
-		else m_tbDeleted.pop_back();
-	}*/
-
-	/*for (int x = 0; x < threads; ++x) {
-		delThList[x].wait();
-		delThList[x].get();
-	}*/
 }
 
 int World::GettbDeleted() const { return m_tbDeleted.size(); }

SQCSim-common/world.h

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

@@ -4,24 +4,26 @@
 
 Connection::Connection(SOCKET sock,
 	sockaddr_in sockaddr,
-					   LoginInfo log, 
+	LoginInfo *log,
-					   PlayerInfo play):
+	PlayerInfo *play) :
 	m_sock(sock),
 	m_addr(sockaddr),
-	m_loginfo(log), 
+	m_loginfo(*log),
-	m_playinfo(play) {
+	m_playinfo(*play) {
 
 }
 
-Connection::~Connection() { closesocket(m_sock); }
+Connection::~Connection() { 
+	delete player;
+	closesocket(m_sock); }
 
-uint64_t Connection::GetHash(bool self) const { return self? m_loginfo.sid: m_playinfo.id; }
+uint64_t Connection::GetHash(bool self) const { return self ? m_loginfo.sid : m_playinfo.id; }
 
 uint64_t Connection::GetTeamHash() const { return m_loginfo.tid; }
 
 std::string Connection::GetName() const { return m_loginfo.name; }
 
-void Connection::AddInput(Input in) { m_input_manifest.insert({ in.timestamp, in }); }
+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,70 +52,196 @@ 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);
+	recvPacksFrom(sock, &m_buf, m_addr, &lsPck);
-
 	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 (player->AmIDead())
+				break;
+			else 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;
+	static uint32_t lasttimer = timer;
+
+	if (m_output_vector.empty() && player->AmIDead()) {
+		if (timer != lasttimer) {
+			lasttimer = timer;
+			Sync sync;
+			sync.timestamp = sync.sid = m_loginfo.sid;
+			sync.hp = 0;
+			sync.ammo = -1;
+			sync.timer = timer;
+			sendPackTo<Sync>(sock, &sync, &m_bufout, &m_addr);
+		}
+	}
+
+	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;
 			sendPackTo<Output>(sock, &out, &m_bufout, conn->getAddr());
 		}
+		++outs;
+
+		[[unlikely]] if (last == 0) // !
+			last = out.timestamp;
+
+		outs += out.timestamp + last;
+
+		static bool syncdead = false;
+		bool dead = player->AmIDead();
+
+		if (outs >= SYNC_ACC || (!syncdead && dead)) {
+			Sync sync;
+			outs -= SYNC_ACC;
+			sync.timestamp = out.timestamp;
+			sync.position = out.position;
+			sync.sid = m_loginfo.sid;
+			sync.timer = timer;
+			sync.timestamp = out.timestamp;
+			sync.ammo = -1;
+			sync.hp = player->GetHP();
+			if (dead) {
+				sync.timestamp = m_loginfo.sid;
+				syncdead = true;
+			}
+			sendPackTo<Sync>(sock, &sync, &m_bufout, &m_addr);
+		}
+
+		m_output_vector.pop_front();
 	}
 }
 
-void Connection::Run(World* world) {
+Timestamp Connection::Run(World* world, std::unordered_map<uint64_t, Booster*> boosters) {
 	Input in, last;
 	Output out;
+	Timestamp tstamp = 0;
 	float el;
 
-	if (m_input_manifest.size() < 2)
+	bool dead = player->AmIDead();
-		return;
 
-	while (m_last_in < m_input_manifest.size()) {
+	if (m_input_manifest.size() < 2 && !dead)
-		in = m_input_manifest.at(m_last_in + 1);
+		return tstamp;
-		last = m_input_manifest.at(m_last_in);
 
-		el = (float)(in.timestamp - last.timestamp) / 1000.;
+	while (m_last_in < m_input_vector.size() - 1 || dead) {
-		player.get()->SetDirection(in.direction);
+		if (!dead) {
-		player.get()->ApplyPhysics(player.get()->GetInput(in.keys.forward, 
+			in = m_input_vector.at(m_last_in + 1);
+			last = m_input_vector.at(m_last_in);
+			if (in.timestamp <= m_tstamp) {
+				++m_last_in;
+				continue;
+			}
+			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.;
+			}
+			player->SetDirection(in.direction);
+		}
+		else {
+			el = 1. / 60.;
+			in = Input();
+			
+		}
+		
+		player->ApplyPhysics(player->GetInput(in.keys.forward,
 			in.keys.backward,
 			in.keys.left,
 			in.keys.right,
-														  in.keys.jump, false, el), world, el);
+			in.keys.jump, false, el), 
+			world, el);
 
-		out.position = player.get()->GetPosition();
+		player->TakeBooster(boosters, el);
+
+		if (player->GetPosition().y < -20.) {
+			player->InflictDamage(9000.);
+			player->Killer = GetHash(true);
+		}
+
+		out.states.jumping = player->GetIsAirborne();
+
+		Vector3f horSpeed = player->GetVelocity();
+		horSpeed.y = 0;
+		out.states.running = horSpeed.Length() > .2f;
+		out.states.still = !out.states.running && !out.states.jumping;
+		out.states.hit = player->m_hit;
+		player->m_hit = false;
+
+		if (player->AmIDead()) {
+			in.keys.shoot = false;
+			in.keys.block = false;
+			out.states.dead = true;
+		}
+
+		static bool toggle = false;
+		if (in.keys.block) {
+			if (!toggle) {
+				toggle = true;
+				bool block = false;
+				ChunkMod* cmod = world->ChangeBlockAtCursor(BLOCK_TYPE::BTYPE_METAL,
+					player->GetPosition(),
+					player->GetDirection(),
+					block, true);
+				if (cmod)
+					ChunkDiffs.push_back(std::move(cmod));
+			}
+		}
+		else toggle = false;
+
+		out.states.shooting = in.keys.shoot;
+
+		if (out.states.jumping && out.states.shooting)
+			out.states.jumpshot = true;
+		else out.states.jumpshot = false;
+
+		if (in.keys.shoot && m_shoot_acc <= 0.) {
+			Bullets.emplace_back(new Bullet(player->GetPOV() + player->GetDirection(), player->GetDirection(), GetHash(true)));
+			m_shoot_acc = BULLET_TIME;
+		}
+
+		out.position = player->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_tstamp = tstamp = out.timestamp;
 
+		if (!dead)
 			++m_last_in;
+
+		dead = false;
 	}
+
+	return tstamp;
 }
 
 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--);
 }
+
+Timestamp Connection::GetTStamp() const { return m_tstamp; }

SQCSim-srv/connection.h

@@ -16,11 +16,11 @@ public:
 	Connection(
 		SOCKET sock,
 		sockaddr_in sockaddr,
-		LoginInfo log,
+		LoginInfo *log,
-		PlayerInfo play);
+		PlayerInfo *play);
 	~Connection();
 
-	std::unique_ptr<Player> player = nullptr;
+	Player* player = nullptr;
 
 	uint64_t GetHash(bool self = true) const;
 	uint64_t GetTeamHash() const;
@@ -34,16 +34,29 @@ 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);
+	Timestamp Run(World* world, std::unordered_map<uint64_t, Booster*> boosters);
 
 	void CleanInputManifest(Timestamp time);
+	
+	bool m_nsync = true;
+
+	std::vector<Bullet*> Bullets;
+	std::vector<ChunkMod*> ChunkDiffs;
+
+	Timestamp GetTStamp() const;
+
 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;
+	Timestamp m_tstamp = 0;
+
 	SOCKET m_sock;
 	sockaddr_in m_addr;
 	LoginInfo m_loginfo;

SQCSim-srv/define.h

@@ -11,4 +11,21 @@
 #define ID_LIST_SIZE 127
 #define SRV_MANUAL_SETUP true
 
+// @ = Dead guy, $ = Killer.
+const std::vector<std::string> DEATHMESSAGES = { "@ has gone to meet their maker.",
+			   								     "@ has bit the dust, if you know what I mean.",
+												 "@ has ceased to be.",
+												 "@ is no more.",
+												 "@ is like, super dead.",
+												 "Requiescat In Pace, @.",
+												 "So long, @, and thanks for all the lols!", 
+												 "@ has a bad case of being dead.",
+												 "@ has finally seen the light!",
+												 "$ sees dead people; in this case they see a dead @.",
+												 "Thought @ was hot; guess what? He's not. He is dead, dead, dead.",
+												 "@ did not want to live forever.",
+												 "$ made @ die for their country.",
+												 "$ has become death, destroyer of @.",
+												 "$ did not make @ feel lucky." };
+
 #endif

SQCSim-srv/main.cpp

@@ -3,6 +3,11 @@
 int main() {
 	std::unique_ptr<Server> server = std::make_unique<Server>();
 	if (server->Init() == 0)
-		if (server->Ready() == 0)
+		while (server->Ready() == 0) {
 			server->Run();
+			if (!server->NewGameRequested())
+				break;
+			server->Cleanup();
+		}
+	server->DeInit();
 }

SQCSim-srv/server.cpp

@@ -18,9 +18,10 @@ Server::~Server() {
 		closesocket(m_sock_udp);
 	if (m_sock_tcp)
 		closesocket(m_sock_tcp);
-	for (const auto& [key, player] : m_players)
+	for (const auto& [key, player] : m_conns)
 		closesocket(player->getSock());
-		m_players.clear();
+	m_conns.clear();
+	delete m_world;
 #ifdef _WIN32
 	WSACleanup();
 #endif
@@ -76,17 +77,20 @@ 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;
 		}
 	} while (m_game.countdown < 1);
+	// m_game.seed = 9370707;
 	do {
 		Log("Entrez le seed de la partie: ", false, false);
 		std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
 		try {
 			m_game.seed = std::stoi(m_buf.ptr);
-		} catch(const std::exception& e) {
+		}
+		catch (const std::exception& e) {
 			Log(e.what(), true, false);
 			m_game.seed = 0;
 		}
@@ -96,14 +100,25 @@ 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;
 		}
 		if (nbrjoueurs <= 0 || nbrjoueurs > MAX_CONNECTIONS)
 			Log("Nombre de joueurs invalide.", true, false);
 	} while (nbrjoueurs <= 0 || nbrjoueurs > MAX_CONNECTIONS);
-
+	do {
+		Log("Entrez le nombre de boosters: ", false, false);
+		std::cin.getline(m_buf.ptr, BUFFER_LENGTH);
+		try {
+			m_boostcount = std::stoi(m_buf.ptr);
+		}
+		catch (const std::exception& e) {
+			Log(e.what(), true, false);
+			m_boostcount = -1;
+		}
+	} while (m_boostcount < 0);
 	m_game.gameType = 1;
 
 	if (listen(m_sock_tcp, MAX_CONNECTIONS) < 0) {
@@ -127,7 +142,7 @@ int Server::Ready() {
 			str.append(inet_ntop(AF_INET, &sockad.sin_addr, m_buf.ptr, m_buf.len)).append(": ").append(std::to_string(sockad.sin_port));
 
 			if (recv(sock, m_buf.ptr, m_buf.len, 0) > 0) {
-				PlayerInfo play;
+				PlayerInfo* play = new PlayerInfo();
 
 				m_buf.len = BUFFER_LENGTH;
 				Packet pck = getPack(&m_buf);
@@ -145,32 +160,35 @@ 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->id = getUniqueId();
-				strcpy(play.name, log->name);
+				play->tid = log->tid;
+				strcpy(play->name, 32, log->name);
 
-				play.tid = log->tid;
+				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);
-				Connection* conn = new Connection(sock, sockad, *log, play);
+				Connection* conn = new Connection(sock, sockad, log, play);
 
-				for (auto& [key, player] : m_players) {
+				m_conns[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;
 
 				if (++nbrconn >= nbrjoueurs)
 					readystart = true;
 			}
 		}
 	}
+	for (auto& [keyin, playin] : m_conns) // Not pretty, but it works.
+		for (auto& [keyout, playout] : m_conns) {
+			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;
 }
 
@@ -182,62 +200,323 @@ void Server::Run() {
 
 	Log("Debut de la partie...", false, false);
 
-	int players = m_players.size();
+	int players = m_conns.size();
 
 	m_world = new World();
 	m_world->SetSeed(m_game.seed);
 	m_world->GetChunks().Reset(nullptr);
 	m_world->BuildWorld();
 
-	for (auto& [key, conn] : m_players) { // Creation des instances de joueurs et premier sync.
+	for (auto& [key, conn] : m_conns) { // Creation des instances de joueurs et premier sync.
-		conn->player = std::make_unique<Player>(Vector3f(8.5f, CHUNK_SIZE_Y + 1.8f, 8.5f));
+		if (!conn) {
+			m_conns.erase(key);
+			continue;
+		}
+		int x = (rand() % (CHUNK_SIZE_X * WORLD_SIZE_X - 1) - (CHUNK_SIZE_X * WORLD_SIZE_X / 2)) / 4,
+			y = (rand() % (CHUNK_SIZE_Z * WORLD_SIZE_Y - 1) - (CHUNK_SIZE_Z * WORLD_SIZE_Y / 2)) / 4;
+		conn->player = new Player(Vector3f(x + .5f, CHUNK_SIZE_Y + 1.8f, y + .5f));
+		conn->player->m_username = conn->GetName();
+		m_players[key] = conn->player;
 		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());
 	}
 	
-	while (!endgame) {
+	int timer = m_game.countdown, timer_acc = 0, deadplayers = 0;
-		for (auto& [key, conn] : m_players) {
+	std::chrono::high_resolution_clock::time_point start = std::chrono::high_resolution_clock::now();
-			conn->getPacks(m_sock_udp);
+	Timestamp last = 0;
-			conn->Run(m_world);
+	std::vector<Chat*> chatlog;
-			conn->sendPacks(m_sock_udp, m_players);
+	std::vector<ChunkMod*> chunkdiffs;
+	std::vector<Bullet*> bullets;
+	std::vector<std::vector<Bullet*>::iterator> bullit;
+	std::vector<BulletAdd*> netbull;
+	std::vector<PickupMod*> netboosters;
+	std::vector<char*> lsPck;
+
+	int max = 0;
+	for (int64_t x = 0; x < m_boostcount; ++x) {
+		Vector3f pos = Vector3f(rand() % (WORLD_SIZE_X * CHUNK_SIZE_X) + .5f, rand() % CHUNK_SIZE_Y + .5f, rand() % (WORLD_SIZE_Y * CHUNK_SIZE_Z) + .5f);
+		if (m_world->BlockAt(pos) == BTYPE_AIR && m_world->BlockAt(Vector3f(pos.x, pos.y - 2, pos.z)) != BTYPE_AIR) {
+			Booster* boost = new Booster(pos, (BOOST_TYPE)(rand() % BTYPE_BOOST_LAST), getUniqueId());
+			m_boosters[boost->GetId()] = boost;
+		}
+		else --x;
+		if (++max > 100000)
+			break;
+	}
+
+	Chat* startchat = new Chat();
+	startchat->src_id = 0;
+	char startmess[] = "How would -YOU- like to die today, motherf-words?";
+	float endtime = 0.;
+	strcpy(startchat->mess, 140, startmess);
+
+	chatlog.emplace_back(startchat);
+		
+	while (!endgame && endtime < 1.) {
+		using namespace std::chrono;
+		Timestamp tstamp = duration_cast<milliseconds>(high_resolution_clock::now() - start).count();
+
+		if (last == 0)
+			last = tstamp;
+		timer_acc += tstamp - last;
+		if (timer_acc >= 1000) {
+			while (timer_acc >= 1000)
+				timer_acc -= 1000;
+			if (!endgame)
+				--timer;
+			std::string str = "Timer: ";
+			Log(str.append(std::to_string(timer)), false, false);
+		}
+		last = tstamp;
+
+
+		for (auto& [key, conn] : m_conns) {				
+
+			/* In */
+
+			Input in; Sync sync;
+
+			recvPacks(m_sock_udp, &m_buf, &lsPck);
+			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 (m_conns.count(in.sid))
+							m_conns[in.sid]->AddInput(in);
+					}
+					break;
+				case SYNC:
+					if (Deserialize(&sync, pck, &bsize)) {}
+					break;
+				default: break;
+				}
+			}
+			if (!lsPck.empty())
+				lsPck.clear();
+
+			/* Process */
+
+			if (conn->m_nsync) {
+				Timestamp tstamp = conn->Run(m_world, m_boosters);
+
+				if (conn->player->AmIDead() && !conn->player->Eulogy) {
+					Chat* chat = new Chat();
+					chat->dest_id = chat->dest_team_id = chat->src_id = 0;
+
+					Player* murderer = m_conns.at(conn->player->Killer)->player;
+
+					if (murderer != conn->player)
+						murderer->addPoint();
+
+					std::string killer = murderer->GetUsername();
+					
+					std::string mess = getDeathMessage(conn->player->GetUsername(), killer);
+					
+					strcpy(chat->mess, 140, mess.c_str());
+					chatlog.emplace_back(chat);
+					++deadplayers;
+
+					conn->player->Eulogy = true;
+					conn->m_nsync = false;
+				}
+				else {
+					for (auto& chmo : conn->ChunkDiffs)
+						chunkdiffs.emplace_back(std::move(chmo));
+					if (!conn->ChunkDiffs.empty())
+						conn->ChunkDiffs.clear();
+
+					for (auto& bull : conn->Bullets) {
+						bullets.emplace_back(bull);
+						BulletAdd* nbul = new BulletAdd();
+						nbul->pos = bull->getPos();
+						nbul->dir = bull->getVel();
+						nbul->id = key;
+						nbul->tstamp = tstamp;
+
+						netbull.emplace_back(std::move(nbul));
+					}
+					if (!conn->Bullets.empty())
+						conn->Bullets.clear();
+				}
+			}
+			/* Out */
+			conn->sendPacks(m_sock_udp, m_conns, timer);
+
+			if ((deadplayers == players - 1 && deadplayers != 0) || timer < 0) {
+				if (!endgame) {
+					Chat* gameover = new Chat();
+					gameover->dest_id = gameover->dest_team_id = gameover->src_id = 0;
+					std::string winner, winmess;
+					int score = 0; 
+					bool plural = false;
+					for (auto& [key, conn] : m_conns) {
+						if (conn->player->getScore() > score) {
+							winner = conn->player->GetUsername();
+							score = conn->player->getScore();
+							plural = false;
+						}
+						else if (conn->player->getScore() == score) {
+							winner = winner.append(" and ").append(conn->player->GetUsername());
+							plural = true;
 						}
 					}
 
-	//while (true) {
+					winmess = "And the winner";
-	//	if (recvfrom(m_sock_udp, m_buf.ptr, m_buf.len, 0, (sockaddr*)&sockad, &socklen) > 0) {
+					if (!plural)
-	//		Packet pck = getPack(&m_buf);
+						winmess = winmess.append(" is ");
-	//		switch (pck.type) {
+					else winmess = winmess.append("s are ");
-	//			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);
- //       }
-	//}
 				
+					winmess = winmess.append(winner).append(" with ").append(std::to_string(score)).append(" point");
+
+					if (score > 1)
+						winmess = winmess.append("s.");
+					else winmess = winmess.append(".");
+
+					strcpy(gameover->mess, 140, winmess.c_str());
+					
+					chatlog.emplace_back(gameover);
+				}
+				endgame = true;
+				endtime += .001;
+			}
+		}
+
+		int max = 0;
+		for (auto& [key, booster] : m_boosters) {
+			if (booster->modified) {
+				PickupMod pmod;
+				pmod.available = booster->GetAvailability();
+				pmod.id = booster->GetId();
+				pmod.pos = booster->GetPosition();
+
+				Boosts boost;
+				switch (booster->GetType()) {
+				case BTYPE_DAMAGE:
+					boost.damage = true;
+					break;
+				case BTYPE_HEAL:
+					boost.hp = true;
+					break;
+				case BTYPE_INVINCIBLE:
+					boost.invincible = true;
+					break;
+				default: continue;
+				}
+				pmod.boost = boost;
+				booster->modified = false;
+				for (auto& [key, conn] : m_conns)
+					sendPackTo<PickupMod>(m_sock_udp, &pmod, &m_buf, conn->getAddr());
+				max++;
+				if (max > 5)
+					break;
+			}
+		}
+
+		for (auto& bull : netbull) {
+			for (auto& [key, conn] : m_conns)
+				if (bull->id != conn->GetHash(false)) // Pour pas repitcher au joueur sa propre balle.
+					sendPackTo<BulletAdd>(m_sock_udp, bull, &m_buf, conn->getAddr());
+			delete bull;
+		}
+		if (!netbull.empty())
+			netbull.clear();
+
+		for (auto bull = bullets.begin(); bull != bullets.end(); ++bull) {
+			ChunkMod* cmod = nullptr;
+			Bullet* bullet = *bull;
+			if (bullet->Update(m_world, (1. / 60.), 50, m_players, &cmod)) {
+				if (cmod)
+					chunkdiffs.emplace_back(cmod);
+				bullit.push_back(bull);
+			}
+		}
+
+		for (auto& bull : bullit) {
+			delete* bull;
+			bullets.erase(bull);
+		}
+
+		if (!bullit.empty())
+			bullit.clear();
+
+		for (auto& chat : chatlog) {
+			Log(chat->mess, false, false);
+			for (auto& [key, conn] : m_conns) 
+				sendPackTo<Chat>(m_sock_udp, chat, &m_buf, conn->getAddr());
+			delete chat;
+		}
+		if (!chatlog.empty())
+			chatlog.clear();
+
+		for (auto& chmo : chunkdiffs) {
+			for (auto& [key, conn] : m_conns)
+				sendPackTo<ChunkMod>(m_sock_udp, chmo, &m_buf, conn->getAddr());
+			delete chmo;
+		}
+		if (!chunkdiffs.empty())
+			chunkdiffs.clear();
+	}
+
+	Chat end;
+	end.src_id = 0;
+	char endmess[] = "Game over, man. Game over.";
+	strcpy(end.mess, 140, endmess);
+
+	for (auto& [key, conn] : m_conns) {
+		std::string str = conn->player->GetUsername();
+		Log(str.append(" ").append(std::to_string(conn->player->getScore())), false, false);
+	}
+
+	for (auto& [key, conn] : m_conns)
+		sendPackTo<Chat>(m_sock_udp, &end, &m_buf, conn->getAddr());
+
+	// TODO: Gérer les 2-3 secondes post-game avant le billboard pour pas avoir un whiplash à la fin de la game.
+
+	char* ch = new char[2];
+	std::cout << "Nouvelle partie? [o/N] ";
+	std::cin.getline(ch, 2);
+	std::cout << std::endl;
+
+	m_exit = true;
+	if (ch[0] == 'o' || ch[0] == 'O')
+		m_exit = false;
+
+	delete[] ch;
 }
 
+void Server::Cleanup() {
+	for (auto& [key, conn] : m_conns)
+		delete conn;
+	
+	m_conns.clear();
+	m_players.clear();
+	delete m_world;
+	m_world = nullptr;
+}
+
+void Server::DeInit() {
+	if (m_logfile.is_open())
+		m_logfile.close();
+	if (m_sock_udp)
+		closesocket(m_sock_udp);
+	if (m_sock_tcp)
+		closesocket(m_sock_tcp);
+
+#ifdef _WIN32
+	WSACleanup();
+#endif
+}
+
+bool Server::NewGameRequested() const { return !m_exit; }
+
 inline std::string Server::LogTimestamp() {
 	time_t rawtime;
 	tm timeinfo;
@@ -276,10 +555,11 @@ void Server::Log(std::string str, bool is_error = false, bool is_fatal = false)
 			closesocket(m_sock_udp);
 		if (m_sock_tcp)
 			closesocket(m_sock_tcp);
-		for (const auto& [key, player] : m_players) {
+		for (const auto& [key, player] : m_conns)
 			closesocket(player->getSock());
-		}
+		
-		m_players.clear();
+		delete m_world;
+		m_conns.clear();
 #ifdef _WIN32
 		WSACleanup();
 #endif
@@ -302,3 +582,34 @@ uint64_t Server::getUniqueId() {
 	m_ids.pop_back();
 	return id;
 }
+
+std::string Server::getDeathMessage(std::string username, std::string killer) const {
+	std::string mess;
+	std::string temp = DEATHMESSAGES.at(rand() % DEATHMESSAGES.size());
+	size_t ind = temp.find('@');
+	size_t indk = temp.find('$');
+	bool bypass = false;
+
+	if (indk == std::string::npos)
+		bypass = true;
+
+	if (ind < indk || bypass) {
+		mess.append(temp.substr(0, ind));
+		mess.append(username);
+		if (!bypass) {
+			mess.append(temp.substr(ind + 1, indk - 1));
+			mess.append(killer);
+			mess.append(temp.substr(indk + 1));
+		}
+		else mess.append(temp.substr(ind + 1));
+	}
+	else {
+		mess.append(temp.substr(0, indk));
+		mess.append(killer);
+		mess.append(temp.substr(indk + 1, ind - 1));
+		mess.append(username);
+		mess.append(temp.substr(ind + 1));
+	}
+
+	return mess;
+}

SQCSim-srv/server.h

@@ -1,6 +1,7 @@
 #ifndef SERVER_H__
 #define SERVER_H__
 
+#include <cstdlib>
 #include <fstream>
 #include <vector>
 #include <set>
@@ -23,6 +24,9 @@ public:
 	int Init();
 	int Ready();
 	void Run();
+	void Cleanup();
+	void DeInit();
+	bool NewGameRequested() const;
 
 private:
 
@@ -36,19 +40,24 @@ private:
 
 	Buffer m_buf;
 
-	std::unordered_map<uint64_t, Connection*> m_players;
+	std::unordered_map<uint64_t, Player*> m_players;
+	std::unordered_map<uint64_t, Connection*> m_conns;
 	std::unordered_map<Timestamp, Chat> m_chatlog;
+	std::unordered_map<uint64_t, Booster*> m_boosters;
 	std::vector<uint64_t> m_ids;
 	GameInfo m_game;
 
 	World* m_world = nullptr;
-	const bool m_manual_setup = SRV_MANUAL_SETUP;
+	bool m_exit = true;
+
+	int64_t m_boostcount = -1;
 
 	std::string LogTimestamp();
 	void Log(std::string str, bool is_error, bool is_fatal);
 	void buildIdList(size_t size);
 
 	uint64_t getUniqueId(); 	
+	std::string getDeathMessage(std::string username, std::string killer) const;
 
 };
 

SQCSim2021/SQCSim2021.vcxproj

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

SQCSim2021/SQCSim2021.vcxproj.filters

@@ -53,9 +53,6 @@
     <ClInclude Include="remoteplayer.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
-    <ClInclude Include="booster.h">
-      <Filter>Fichiers d%27en-tête</Filter>
-    </ClInclude>
     <ClInclude Include="settings.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
@@ -103,9 +100,6 @@
     <ClCompile Include="remoteplayer.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
-    <ClCompile Include="booster.cpp">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
     <ClCompile Include="settings.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>

SQCSim2021/audio.cpp

@@ -2,26 +2,40 @@
 
 Audio::Audio() {
 	m_engine = irrklang::createIrrKlangDevice();
-	m_engine->setDopplerEffectParameters(10);
+	m_engine->setDopplerEffectParameters(1);
-	m_engine->setRolloffFactor(2);
+	m_engine->setRolloffFactor(1);
-	m_engine->setDefault3DSoundMinDistance(.1);
+	m_engine->setDefault3DSoundMinDistance(1);
 	m_engine->setDefault3DSoundMaxDistance(1000);
 }
 
-Audio::Audio(const char * music) {
+Audio::Audio(const char * music, const char* menumusic) {
 	m_engine = irrklang::createIrrKlangDevice();
 	m_engine->setDopplerEffectParameters(1);
-	m_engine->setRolloffFactor(2);
+	m_engine->setRolloffFactor(1);
-	m_engine->setDefault3DSoundMinDistance(.1);
+	m_engine->setDefault3DSoundMinDistance(1);
-	m_engine->setDefault3DSoundMaxDistance(1000);
+	m_engine->setDefault3DSoundMaxDistance(100);
-	m_music = m_engine->play2D(music, false, true, true, irrklang::ESM_STREAMING);
+	m_music = m_engine->play2D(music, true, true, true, irrklang::ESM_STREAMING);
+	m_menumusic = m_engine->play2D(menumusic, true, true, true, irrklang::ESM_STREAMING);
+	m_music->setVolume(.5);
+	m_menumusic->setVolume(.5);
+	m_mainvolume = 0.5f;
+	m_engine->setSoundVolume(m_mainvolume);
+	m_sfxvolume = 0.5f;
 }
 
 Audio::~Audio() { 
 	if (m_music) m_music->drop();
+	if (m_menumusic) m_menumusic->drop();
 	if (m_engine) m_engine->drop();
 }
 
+void Audio::playSound(const char* name, float volume = 1.) {
+	irrklang::ISound* sfx = m_engine->play2D(name, false, true);
+	sfx->setVolume(volume);
+	sfx->setIsPaused(false);
+	m_sfxes.push_back(sfx);
+}
+
 void Audio::Update3DAudio(Vector3f pos, Vector3f dir, Vector3f vel) {
 	m_engine->setListenerPosition(irrklang::vec3df(pos.x, pos.y, pos.z),
 								  irrklang::vec3df(dir.x, dir.y, dir.z),
@@ -29,9 +43,10 @@ void Audio::Update3DAudio(Vector3f pos, Vector3f dir, Vector3f vel) {
 }
 
 irrklang::ISound* Audio::Create3DAudioObj(irrklang::ISound* sound, const char* name, Vector3f pos, Vector3f vel, bool is_looped = false, float volume = 1) {
-	sound = m_engine->play3D(name, irrklang::vec3df(pos.x, pos.y, pos.z), is_looped, false, true, is_looped? irrklang::ESM_STREAMING: irrklang::ESM_NO_STREAMING, true);
+	sound = m_engine->play3D(name, irrklang::vec3df(pos.x, pos.y, pos.z), is_looped, true, true, is_looped? irrklang::ESM_STREAMING: irrklang::ESM_NO_STREAMING, true);
 	sound->setVelocity(irrklang::vec3df(vel.x, vel.y, vel.z));
 	sound->setVolume(volume);
+	sound->setIsPaused(false);
 	return sound;
 }
 
@@ -45,10 +60,76 @@ void Audio::Render3DAudioObj(irrklang::ISound* sound, Vector3f& pos, Vector3f& v
 //	m_music = m_engine->play2D(music, false, false, false, irrklang::ESM_STREAMING);
 //}
 
-void Audio::ToggleMusicState() { m_music->setIsPaused(!m_music->getIsPaused()); }
+void Audio::CleanupSFX() {
+	while (!m_sfxes.empty()) {
+		irrklang::ISound* sfx = m_sfxes.back();
+		if (sfx->isFinished()) {
+			sfx->drop(); // drop() fait deja la job du delete sfx.
+		}
+		else break;
+		m_sfxes.pop_back();
+	}
+}
+
+void Audio::ToggleMusicState(GameState state) {
+	if (m_music_on) {
+		switch (state) {
+		case PLAY:
+			m_music->setIsPaused(false);
+			m_menumusic->setIsPaused(true);
+			break;
+		case PAUSE:
+			m_music->setIsPaused(true);
+			m_menumusic->setIsPaused(true);
+			break;
+		default:
+			m_music->setIsPaused(true);
+			m_menumusic->setIsPaused(false);
+			break;
+		}
+	}
+	else {
+		m_music->setIsPaused(true);
+		m_menumusic->setIsPaused(true);
+	}
+}
+
+void Audio::SetMusic(bool ison, GameState state) {
+	m_music_on = state;
+	if (!state) {
+		m_music->setIsPaused(true);
+		m_menumusic->setIsPaused(true);
+	}
+	else ToggleMusicState(state);
+}
+
+bool Audio::GetMusic() {
+	return m_music_on;
+}
 
 void Audio::PauseEngine() { m_engine->setAllSoundsPaused(); }
 
 float Audio::GetMusicVolume() const {
 	return m_music->getVolume();
 }
+
+void Audio::SetMusicVolume(float volume) {
+	m_music->setVolume(volume);
+	m_menumusic->setVolume(volume);
+}
+
+float Audio::GetMainVolume() const {
+	return m_engine->getSoundVolume();
+}
+
+void Audio::SetMainVolume(float volume) {
+	m_engine->setSoundVolume(volume);
+}
+
+float Audio::GetSfxVolume() const {
+	return m_sfxvolume;
+}
+
+void Audio::SetSfxVolume(float volume) {
+	m_sfxvolume = volume;
+}

SQCSim2021/audio.h

@@ -15,26 +15,46 @@
 class Audio {
 private:
 	irrklang::ISound* m_music;
+	irrklang::ISound* m_menumusic;
+	float m_mainvolume;
+	float m_sfxvolume;
+	bool m_music_on = true;
+	std::vector<irrklang::ISound*> m_sfxes;
 
 public:
 	Audio();
-	Audio(const char* music);
+	Audio(const char* music, const char* menumusic);
 	~Audio();
 	irrklang::ISoundEngine* m_engine;
 
 	void Update3DAudio(Vector3f pos, Vector3f dir, Vector3f speed);
 
+
 	irrklang::ISound* Create3DAudioObj(irrklang::ISound* sound, const char* name, Vector3f pos, Vector3f vel, bool is_looped, float volume);
 
 	void Render3DAudioObj(irrklang::ISound* sound, Vector3f& pos, Vector3f& vel, float volume);
 
 	//void PlaySong(const char* music);
 
-	void ToggleMusicState();
+	void CleanupSFX();
+
+	void ToggleMusicState(GameState state);
+
+	void playSound(const char* sound, float volume);
+
+	void SetMusic(bool ison, GameState state);
+	bool GetMusic();
 
 	void PauseEngine();
 
+	float GetMainVolume() const;
+	void SetMainVolume(float volume);
+
 	float GetMusicVolume() const;
+	void SetMusicVolume(float volume);
+
+	float GetSfxVolume() const;
+	void SetSfxVolume(float volume);
 };
 
 #endif // AUDIO_H__

SQCSim2021/booster.cpp

@@ -1,46 +0,0 @@
-#include "booster.h";
-
-void Booster::RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas,  Shader& shader, Transformation tran)
-{
-	//
-	//Vector3f playerToQuad = m_player.GetPosition() - m_position;
-	//playerToQuad.Normalize();
-	//Vector3f targetPosition = m_player.GetPosition() + playerToQuad * 10.0f;
-	//Matrix4f rotationMatrix;
-	//rotationMatrix.SetLookAt(m_position, targetPosition, Vector3f(0, 1, 0));
-	//glMultMatrixf(rotationMatrix.GetInternalValues());
-	float x = pos.x;
-	float y = pos.y;
-	float z = pos.z;
-	float width = 1.0f;
-	float height = 1.0f;
-	//Pt override les collisions.. a ce point la je sais pas quoi faire
-
-	//Matrix4 mat4 = tran.GetMatrix();
-	//mat4 VP = pMatrix * vMatrix;
-	//Vector3f CameraRight = Vector3f(mat4.Get11(), mat4.Get21(), mat4.Get31());
-	//Vector3f CameraUp = Vector3f(mat4.Get12(), mat4.Get22(), mat4.Get32());
-
-	//Vector3f v1 = (m_position + CameraRight * 0.5 * width + CameraUp * -0.5 * width);
-	//Vector3f v2 = (m_position + CameraRight * 0.5 * width + CameraUp * 0.5 * width);
-	//Vector3f v4 = (m_position + CameraRight * -0.5 * width + CameraUp * -0.5 * width);
-	//Vector3f v3 = (m_position + CameraRight * -0.5 * width + CameraUp * 0.5 * width);
-
-	//tran.ApplyTranslation(m_position);
-	float u, v, w, h;
-	//glDisable(GL_DEPTH_TEST);
-	shader.Use();
-	textureAtlas.Bind();
-	textureAtlas.TextureIndexToCoord(8, u, v, w, h);
-	//glLoadIdentity();
-	glLoadMatrixf(tran.GetMatrix().GetInternalValues());
-	glBegin(GL_QUADS);
-	glTexCoord2f(u, v); glVertex3f(x - width / 2., y - height, z); //glVertex3f(v4.x, v4.y, v4.z);//glVertex3f(0, 50, 0);
-	glTexCoord2f(u + w, v); glVertex3f(x + width / 2., y - height, z); //glVertex3f(v3.x, v3.y, v3.z); //glVertex3f(50,50, 0);
-	glTexCoord2f(u + w, v + h); glVertex3f(x + width / 2., y, z); //glVertex3f(v2.x, v2.y, v2.z); //glVertex3f(50, 0, 0);
-	glTexCoord2f(u, v + h); glVertex3f(x - width / 2., y, z); //glVertex3f(v1.x, v1.y, v1.z);// glVertex3f(0, 0, 0);
-	glEnd();
-	shader.Disable();
-	//tran.ApplyTranslation(-m_position);
-	//glEnable(GL_DEPTH_TEST);
-}

SQCSim2021/booster.h

@@ -1,14 +0,0 @@
-#ifndef BOOSTER_H__
-#define BOOSTER_H__
-#include "define.h"
-#include "textureatlas.h"
-#include "shader.h"
-#include "../SQCSim-common/vector3.h"
-#include "../SQCSim-common/transformation.h"
-
-
-class Booster {
-public:
-	void RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas,  Shader& shader, Transformation tran);
-};
-#endif

SQCSim2021/cmake/CMakeLists.txt

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

SQCSim2021/connector.cpp

@@ -65,20 +65,15 @@ int Connector::Connect(const char* srv_addr, std::string name) {
 
 	netprot::Buffer bf;
 	netprot::LoginInfo log;
-	strcpy(log.name, name.c_str());
+	strcpy(log.name, 32, name.c_str());
 
 	netprot::sendPack(m_sock_tcp, &log, &bf);
 
-	//using namespace std::chrono_literals;
-	//std::this_thread::sleep_for(100ms);
-
-	memset(bf.ptr, '\0', BUFFER_LENGTH);
-
 	bool ready = false;
 	int errors = 0;
 	std::vector<char*> lsPck;
 	while (!ready) {
-		lsPck = netprot::recvPacks(m_sock_tcp, &bf);
+		netprot::recvPacks(m_sock_udp, &bf, &lsPck);
 
 		for (auto& pck : lsPck) {
 			uint32_t bsize = bf.len - (pck - bf.ptr);
@@ -97,7 +92,10 @@ 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;
+					std::cout << "A challenger appears! " << pl->name << std::endl;
+				}
 				break;
 			case TEAMINF:
 				// TODO: Faire dequoi avec TeamInfo si on fini par avoir des teams.

SQCSim2021/define.h

@@ -25,11 +25,20 @@
 
 #define BULLET_UPDATES_PER_FRAME 20
 
-#define BASE_WIDTH 640
+#define BASE_WIDTH 1280
-#define BASE_HEIGHT 480
+#define BASE_HEIGHT 720
+
 
 #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/"
@@ -39,8 +48,8 @@
 enum GameState { 
 	MAIN_MENU, 
 	SPLASH,
+	LOBBY,
 	OPTIONS,
-	QUIT, 
 	PLAY, 
 	PAUSE
 };
@@ -49,7 +58,7 @@ enum Resolution {
 	HD = 0,		// 1280x720	 (High Definition)
 	FHD,		// 1920x1080 (Full HD)
 	QHD,		// 2560x1440 (Quad HD)
-	UHD			// 3840x2160 (Ultra HD)
+	UHD,		// 3840x2160 (Ultra HD)
 };
 
 #endif // DEFINE_H__

SQCSim2021/docs/analyse_serveur.md

@@ -1 +0,0 @@
-

SQCSim2021/engine.h

@@ -5,6 +5,7 @@
 #include <chrono>
 #include <cmath>
 #include <unordered_map>
+#include <set>
 #include "../SQCSim-common/array2d.h"
 #include "../SQCSim-common/blockinfo.h"
 #include "../SQCSim-common/boostinfo.h"
@@ -13,6 +14,7 @@
 #include "../SQCSim-common/world.h"
 #include "../SQCSim-common/transformation.h"
 #include "../SQCSim-common/player.h"
+#include "../SQCSim-common/booster.h"
 #include "define.h"
 #include "openglcontext.h"
 #include "texture.h"
@@ -23,13 +25,15 @@
 #include "connector.h"
 #include "renderer.h"
 #include "remoteplayer.h"
-#include "booster.h"
 #include "settings.h"
 
 class Engine : public OpenglContext {
 public:
     Engine();
     virtual ~Engine();
+
+
+
     virtual void Init();
     virtual void DeInit();
     virtual void LoadResource();
@@ -38,21 +42,24 @@ public:
     virtual void KeyPressEvent(unsigned char key);
     virtual void KeyReleaseEvent(unsigned char key);
     virtual void MouseMoveEvent(int x, int y);
-    virtual void MousePressEvent(const MOUSE_BUTTON &button, int x, int y);
+    virtual void MousePressEvent(const MOUSE_BUTTON& button, int x, int y);
-    virtual void MouseReleaseEvent(const MOUSE_BUTTON &button, int x, int y);
+    virtual void MouseReleaseEvent(const MOUSE_BUTTON& button, int x, int y);
 
 private:
     int GetFps(float elapsedTime) const;
     int GetCountdown(float elapsedTime);
     int GetOptionsChoice();
+    bool StartMultiplayerGame();
 
     bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true);
+    void ChangeResolution(Resolution resolution);
 
     void InstantDamage();
     void SystemNotification(std::string systemLog);
     void KillNotification(Player killer, Player killed);
 
     void DisplayNotification(std::string message);
+
     void DisplayCrosshair();
     void DisplayPovGun();
     void DisplayCurrentItem();
@@ -61,13 +68,18 @@ private:
     void DisplayInfo(float elapsedTime, BlockType bloc);
 
     void DisplaySplashScreen();
-    void DisplayPauseMenu();
 
     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 DisplayPauseMenu(float elapsedTime);
+
     void DisplayOptionsMenu();
     void DisplayAudioMenu(float centerX, float centerY);
     void DisplayGraphicsMenu(float centerX, float centerY);
@@ -76,35 +88,27 @@ private:
     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;
+    Audio m_audio = Audio(AUDIO_PATH "music01.wav", AUDIO_PATH "menumusic01.wav");
-
-    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;
+    //Menu
-    std::unordered_map<uint64_t, Player*> m_players;
+    Vector3f m_otherplayerpos = Vector3f(999, 999, 999);
-    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;
@@ -122,6 +126,7 @@ private:
     Texture m_texturePovGun;
     Texture m_textureSkybox;
 
+    Texture m_textureLobbyMenu;
     Texture m_textureMainMenu;
     Texture m_textureOptionsMenu;
     Texture m_texturePauseMenu;
@@ -131,9 +136,15 @@ private:
     Texture m_textureFhd;
     Texture m_textureQhd;
     Texture m_textureUhd;
+
+    Texture m_textureLobbyServer;
+    Texture m_textureLobbyIdentify;
     Texture m_textureCheck;
     Texture m_textureChecked;
 
+    Texture m_texturePauseResume;
+    Texture m_texturePauseMainMenu;
+
     Texture m_textureOptAudio;
     Texture m_textureOptBack;
     Texture m_textureOptGameplay;
@@ -160,18 +171,21 @@ private:
     float m_splashTime = 2.0f;
     float m_scale;
     float m_time = 0;
+
     float m_titleX = 0;
     float m_titleY = 0;
 
+
+
     int m_renderCount = 0;
     int m_countdown = COUNTDOWN;
     int m_nbReductionChunk = 4;
     int m_timerReductionChunk = 30;
 
-    float m_volPrincipal = 0.0f;
+    float m_mainvolume;
-    float m_volMusique = 0.0f;
+    float m_musicvolume;
-    float m_volEffets = 0.0f;
+    float m_sfxvolume;
-    float m_volSensible = 0.0f;
+    float m_sensitivity;
 
     int m_selectedOption = 0;
 
@@ -197,15 +211,34 @@ private:
     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_selectedSinglePlayer = false;
+    bool m_selectedMultiPlayer = false;
+    bool m_singleReady = 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;
@@ -217,6 +250,19 @@ private:
     float m_mousemy = 0;
 
     bool m_networkgame = false;
+
+    Connector m_conn;
+    std::deque<netprot::ChunkMod*> m_chunkmod_manifest;
+    std::chrono::high_resolution_clock::time_point m_startTime;
+    std::unordered_map<uint64_t, Player*> m_players;
+    std::set<uint64_t> m_deadplayers;
+    netprot::Buffer m_buf, m_bufout;
+    netprot::ChunkMod* m_chunkmod = nullptr;
+    std::unordered_map<uint64_t, Booster*> m_boosters;
+    std::set<uint64_t> m_boost_manifest;
+
+    std::unordered_map<uint64_t, netprot::Sync> m_syncs;
+    std::string m_messageNotification = "";
 };
 
 #endif // ENGINE_H__

SQCSim2021/openglcontext.cpp

@@ -16,8 +16,8 @@ bool OpenglContext::Start(const std::string& title, int width, int height, bool
     m_fullscreen = fullscreen;
     InitWindow(width, height);
     
-    Init();
     LoadResource();
+    Init();
 
     sf::Clock clock;
 

SQCSim2021/openglcontext.h

@@ -53,9 +53,9 @@ protected:
     void ShowCrossCursor() const;
 
     bool m_istarted = false;
+    void InitWindow(int width, int height);
 
 private:
-    void InitWindow(int width, int height);
     MOUSE_BUTTON ConvertMouseButton(sf::Mouse::Button button) const;
 
 private:

SQCSim2021/remoteplayer.cpp

@@ -8,15 +8,11 @@
 
 
 
-RemotePlayer::RemotePlayer(netprot::PlayerInfo pinfo) : m_pinfo(pinfo), m_aminacc(0.0f), m_animstate(Anim::STILL), m_team_id(0), current(), previous(), m_texture_front(), Player(Vector3f(0, 0, 0)){
+RemotePlayer::RemotePlayer(netprot::PlayerInfo* pinfo) : m_pinfo(*pinfo), m_aminacc(0.0f), m_animstate(Anim::STILL), m_team_id(0), current(), previous(), m_texture_front(), Player(Vector3f(0, 0, 0)) {
-
-	LoadTexture(m_texture_front, TEXTURE_PATH "AssetOtherPlayer/FinalPNGStanding/BlueFrontRight.png", false, false);
 
 }
 
-RemotePlayer::RemotePlayer(netprot::PlayerInfo pinfo, const Vector3f& pos) : m_pinfo(pinfo), m_aminacc(0.0f), m_animstate(Anim::STILL), m_team_id(0), current(), previous(), m_texture_front(), Player(pos) {
+RemotePlayer::RemotePlayer(netprot::PlayerInfo* pinfo, const Vector3f& pos) : m_pinfo(*pinfo), m_aminacc(0.0f), m_animstate(Anim::STILL), m_team_id(0), current(), previous(), m_texture_front(), Player(pos) {
-
-	LoadTexture(m_texture_front, TEXTURE_PATH "AssetOtherPlayer/FinalPNGStanding/BlueFrontRight.png", false, false);
 
 }
 
@@ -33,98 +29,281 @@ void RemotePlayer::Init()
 
 void RemotePlayer::Feed(const netprot::Output out) {
 
-	//current.position = out.position;
+	m_position = Vector3f(out.position);
-	//current.direction = out.direction;
+	m_direction = Vector3f(out.direction);
-	//current.states = out.states;
+	current.states = out.states;
-	//current.id = out.id;
 	
-	//if (current.position != previous.position)
-	//{
-	//	Vector3f positionDelta = current.position - previous.position;
-	//	m_position = current.position + positionDelta;
-	//	m_direction = current.direction;		
 
-	//}
-
-	//if(current.direction != previous.direction)
-	//{
-	//	m_direction = current.direction;
-	//	current.direction = current.direction;
-	//}
-
-	//if (current.states.shooting) {
-	//	m_animstate = Anim::SHOOTING;
-	//}
-	//else if (current.states.jumping) {
-	//	m_animstate = Anim::JUMPING;
-	//}
-	//else if (current.states.dead) {
-	//	m_animstate = Anim::DEAD;
-	//}
-	//else if(current.states.powerup){
-	//	m_animstate = Anim::POWERUP;
-	//}
-	//else if (current.states.still) {
-	//	m_animstate = Anim::STILL;
-	//}
-	//else if (current.states.running) {
-	//	m_animstate = Anim::RUNNING;
-	//}
-
-	//previous.direction = current.direction;
-	//previous.position = current.position;
-	//previous.states = current.states;
-	//previous.id = current.id;
 }
 
-void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tran, float elapsedTime)
+
+
+
+void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tran, float elapsedTime, Player& camera)
 {
 
-	float x = GetPosition().x;
-	float y = GetPosition().y;
-	float z = GetPosition().z;
 	float width = 1.f;
 	float height = 1.7f;
 
+	Vector3f DiffCam = GetPosition() - camera.GetPosition();
+	Vector3f UpCam = Vector3f(0.f, 1.f, 0.f);
+
+	Vector3f CrossA = DiffCam.Cross(UpCam);
+	Vector3f CrossB = DiffCam.Cross(CrossA);
+
+	CrossA.Normalize();
+	CrossB.Normalize();
+
+	Vector3f playerPosition = GetPosition() + Vector3f(0.f, -.75f, 0.f);
+
+	Vector3f v2 = (playerPosition + CrossA * 0.5 * width + CrossB * 0.5 * height);
+	Vector3f v1 = (playerPosition - CrossA * 0.5 * width + CrossB * 0.5 * height);
+	Vector3f v3 = (playerPosition + CrossA * 0.5 * width - CrossB * 0.5 * height);
+	Vector3f v4 = (playerPosition - CrossA * 0.5 * width - CrossB * 0.5 * height);
+
+	Vector3f angleRemote = GetDirection();
+	Vector3f angleCam = (v1 - v2).Cross(v3 - v2);
+
+	angleCam.y = 0;
+	angleRemote.y = 0;
+	angleCam.Normalize();
+	angleRemote.Normalize();
+
+	float angle = angleRemote.Dot(angleCam);
+	int index = 0;
+	angle = -angle;
+	Vector3f side = angleRemote.Cross(angleCam);
+	side = -side;
+
+	static float time = 0.f;
+	static bool Shooting = false;
+	bool isLeft = side.y > 0;
+
+	time += elapsedTime;
+	if (time >= 0.05)
+	{
+		time -= 0.05;
+
+		Shooting = !Shooting;
+	}
+	
+	//std::cout << "shooting : " << current.states.shooting << " jumping : " << current.states.jumping <<  " jumpshot : " << current.states.jumpshot << " running : " << current.states.running << " still : " << current.states.still << " dead : " << current.states.dead << " hit : " << current.states.hit << std::endl;
+
+	if (angle >= 0.75) //Face - side positif
+	{
+		if (current.states.shooting) {
+			if (Shooting)
+				index = 17;
+			else
+				index = 9;
+		}
+		else if (current.states.jumpshot) {
+			if (Shooting)
+				index = 41;
+			else
+				index = 33;
+		}
+		else if (current.states.jumping)
+			index = 25;
+		else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
+			index = 0;
+
+	}
+	else if (angle >= 0.25 && isLeft) //Frontleft
+	{
+		if (current.states.shooting) {
+			if (Shooting)
+				index = 18;
+			else
+				index = 10;
+
+		}
+		else if (current.states.jumpshot) {
+			if (Shooting)
+				index = 42;
+			else
+				index = 34;
+		}
+		else if (current.states.jumping)
+			index = 26;
+		else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
+			index = 1;
+
+
+	}
+	else if (angle >= -0.25 && isLeft) //ProfileLeft
+	{
+		if (current.states.shooting) {
+			if (Shooting)
+				index = 20;
+			else
+				index = 12;
+
+		}
+		else if (current.states.jumpshot) {
+			if (Shooting)
+				index = 44;
+			else
+				index = 36;
+		}
+		else if (current.states.jumping)
+			index = 28;
+		else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
+			index = 3;
+
+
+	}
+	else if (angle >= -0.75 && isLeft) //BackLeft
+	{
+		if (current.states.shooting) {
+			if (Shooting)
+				index = 22;
+			else
+				index = 14;
+
+		}
+		else if (current.states.jumpshot) {
+			if (Shooting)
+				index = 46;
+			else
+				index = 38;
+		}
+		else if (current.states.jumping)
+			index = 30;
+		else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
+			index = 5;
+
+
+	}
+	else if (angle < -0.75) //Dos - side négatif
+	{
+		if (current.states.shooting) {
+			if (Shooting)
+				index = 24;
+			else
+				index = 16;
+
+		}
+		else if (current.states.jumpshot) {
+			if (Shooting)
+				index = 48;
+			else
+				index = 40;
+		}
+		else if (current.states.jumping)
+			index = 32;
+		else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
+			index = 7;
+
+
+	}
+	else if (angle >= 0.25 && !isLeft) //FrontRight //REVOIR L'ANIME DE SHOOTING EST PAS DRETTE
+	{
+		if (current.states.shooting) {
+			if (Shooting)
+				index = 19;
+			else
+				index = 11;
+		}
+		else if (current.states.jumpshot) {
+			if (Shooting)
+				index = 43;
+			else
+				index = 35;
+		}
+		else if (current.states.jumping)
+			index = 27;
+		else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
+			index = 2;
+
+
+	}
+	else if (angle >= -0.25 && !isLeft) //ProfileRight
+	{
+		if (current.states.shooting) {
+			if (Shooting)
+				index = 21;
+			else
+				index = 13;
+		}
+		else if (current.states.jumpshot) {
+			if (Shooting)
+				index = 45;
+			else
+				index = 37;
+		}
+		else if (current.states.jumping)
+			index = 29;
+		else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
+			index = 4;
+
+
+	}
+	else if (angle >= -0.75 && !isLeft) //BackRight
+	{
+		if (current.states.shooting) {
+			if (Shooting)
+				index = 23;
+			else
+				index = 15;
+
+		}
+		else if (current.states.jumpshot) {
+			if (Shooting)
+				index = 47;
+			else
+				index = 39;
+		}
+		else if (current.states.jumping)
+			index = 31;
+		else if (!current.states.jumping && !current.states.shooting && !current.states.jumpshot)
+			index = 6;
+
+
+	}
 
-	//Matrix4 mat4 = tran.GetMatrix();
-	//mat4 VP = pMatrix * vMatrix;
-	//Vector3f CameraRight = Vector3f(mat4.Get11(), mat4.Get21(), mat4.Get31());
-	//Vector3f CameraUp = Vector3f(mat4.Get12(), mat4.Get22(), mat4.Get32());
 
-	//Vector3f v1 = (m_position + CameraRight * 0.5 * width + CameraUp * -0.5 * width);
-	//Vector3f v2 = (m_position + CameraRight * 0.5 * width + CameraUp * 0.5 * width);
-	//Vector3f v4 = (m_position + CameraRight * -0.5 * width + CameraUp * -0.5 * width);
-	//Vector3f v3 = (m_position + CameraRight * -0.5 * width + CameraUp * 0.5 * width);
 
-	//tran.ApplyTranslation(m_position);
 	float u, v, w, h;
-	//glDisable(GL_DEPTH_TEST);
+
 	shader.Use();
 	atlas.Bind();
-	atlas.TextureIndexToCoord(0, u, v, w, h);
+	atlas.TextureIndexToCoord(index, u, v, w, h);
-	//glLoadIdentity();
 
 	glEnable(GL_BLEND);
+
+
+	if (current.states.hit)
+	{
+		glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR);
+		glBlendColor(1.f, 0.f, 0.f, 1.f);
+
+	}
+	else {
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	}
+
 	glBlendEquation(GL_FUNC_ADD);
 
-	glLoadMatrixf(tran.GetMatrix().GetInternalValues());
-	glBegin(GL_QUADS);
-	glTexCoord2f(u, v); glVertex3f(x - width/2., y - height, z); //glVertex3f(v4.x, v4.y, v4.z);//glVertex3f(0, 50, 0);
-	glTexCoord2f(u + w, v); glVertex3f(x+width/2., y - height, z); //glVertex3f(v3.x, v3.y, v3.z); //glVertex3f(50,50, 0);
-	glTexCoord2f(u + w, v + h); glVertex3f(x+width/2., y, z); //glVertex3f(v2.x, v2.y, v2.z); //glVertex3f(50, 0, 0);
-	glTexCoord2f(u, v + h); glVertex3f(x-width/2., y, z); //glVertex3f(v1.x, v1.y, v1.z);// glVertex3f(0, 0, 0);
-	glEnd();
 
 
+
+	glLoadMatrixf(tran.GetMatrix().GetInternalValues());
+	glDepthFunc(GL_LEQUAL);
+	glBegin(GL_QUADS);
+	glTexCoord2f(u, v); glVertex3f(v1.x, v1.y, v1.z);
+	glTexCoord2f(u + w, v); glVertex3f(v2.x, v2.y, v2.z);
+	glTexCoord2f(u + w, v + h); glVertex3f(v3.x, v3.y, v3.z);
+	glTexCoord2f(u, v + h); glVertex3f(v4.x, v4.y, v4.z);
+
+	glEnd();
+
 	glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR);
 	glBlendEquation(GL_FUNC_SUBTRACT);
 	glDisable(GL_BLEND);
 
 	shader.Disable();
-	//tran.ApplyTranslation(-m_position);
+
-	//glEnable(GL_DEPTH_TEST);
 }
 
 bool RemotePlayer::LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps, bool stopOnError)

SQCSim2021/remoteplayer.h

@@ -14,14 +14,14 @@ class RemotePlayer : public Player {
 public:
 	enum Anim: uint8_t { STILL = 1, RUNNING = 2, JUMPING = 4, SHOOTING = 8, POWERUP = 16,  DEAD = 32 }; // A REVOIR VOIR DEFINE.H POUR LES ANIMES
 	
-	RemotePlayer(netprot::PlayerInfo pinfo);
+	RemotePlayer(netprot::PlayerInfo* pinfo);
-	RemotePlayer(netprot::PlayerInfo pinfo, const Vector3f& pos);
+	RemotePlayer(netprot::PlayerInfo* pinfo, const Vector3f& pos);
 	~RemotePlayer();
 
 
 	void Init();
 	void Feed(const netprot::Output out);
-	void Render(TextureAtlas& atlas, Shader& shader, Transformation tran, float elapsedTime);
+	void Render(TextureAtlas& atlas, Shader& shader, Transformation tran, float elapsedTime, Player& camera);
 	bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps, bool stopOnError);
 	
 	void SetPosition(Vector3f pos) { m_position = pos; }

SQCSim2021/renderer.cpp

@@ -120,7 +120,7 @@ void Renderer::RenderWorld(World* origin, int& rendercount, const Vector3f& play
 	glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
 
 	unsigned int sx, sy, cx, cy;
-	origin->GetScope(sx,sy);
+	origin->GetScope(sx, sy);
 
 	for (int index = 0; index < rendercount; ++index) {
 		int chx = (renderManifest[index].x - sx) * CHUNK_SIZE_X, chy = (renderManifest[index].z - sy) * CHUNK_SIZE_Z;
@@ -129,9 +129,9 @@ void Renderer::RenderWorld(World* origin, int& rendercount, const Vector3f& play
 		glLoadMatrixf(world.GetMatrix().GetInternalValues());
 		float blcolor = renderManifest[index].y / (VIEW_DISTANCE / 50.f);
 		glBlendColor(blcolor, blcolor, blcolor, 1.f);
-		origin->ChunkAt(chx, 1, chy)->GetPosition(cx,cy);
+		origin->ChunkAt(chx, 1, chy)->GetPosition(cx, cy);
 		if (m_meshes.Get(cx - sx, cy - sy))
-			m_meshes.Get(cx - sx, cy -sy)->Render();
+			m_meshes.Get(cx - sx, cy - sy)->Render();
 		world.ApplyTranslation(-chx, 0, -chy);
 	}
 	shader.Disable();
@@ -147,7 +147,7 @@ void Renderer::UpdateMesh(World* origin, const Vector3f& player, BlockInfo* bloc
 	int threads = 0;
 	std::future<Mesh*> updateThList[THREADS_UPDATE_CHUNKS];
 
-	unsigned int mx = 0 , my = 0, sx, sy;
+	unsigned int mx = 0, my = 0, sx, sy;
 
 	origin->GetScope(sx, sy);
 
@@ -244,31 +244,73 @@ void Renderer::UpdateMesh(World* origin, const Vector3f& player, BlockInfo* bloc
 	}
 }
 
-void Renderer::RenderBillboard(const Vector3f pos, TextureAtlas textureAtlas, TextureAtlas::TextureIndex idx, Shader& shader, Transformation tran)
+void Renderer::RenderBooster(TextureAtlas& textureAtlas, Shader& shader, Transformation tran, Player player, Booster* booster) {
-{
+		float width = 1.f;
-	//float x = pos.x;
+		float height = 1.f;
-	//float y = pos.y;
-	//float z = pos.z;
-	//float width = 1.0f;
-	//float height = 1.0f;
 
-	//float u, v, w, h;
+		Vector3f DiffCam = booster->GetPosition() - player.GetPosition();
-	//shader.Use();
+		Vector3f UpCam = Vector3f(0.f, 1.f, 0.f);
-	//textureAtlas.Bind();
-	//textureAtlas.TextureIndexToCoord(idx, u, v, w, h);
 
-	//glLoadMatrixf(tran.GetMatrix().GetInternalValues());
+		Vector3f CrossA = DiffCam.Cross(UpCam);
-	//glBegin(GL_QUADS);
+		Vector3f CrossB = DiffCam.Cross(CrossA);
-	//glTexCoord2f(u, v); glVertex3f(x - width / 2., y - height, z); //glVertex3f(v4.x, v4.y, v4.z);//glVertex3f(0, 50, 0);
+
-	//glTexCoord2f(u + w, v); glVertex3f(x + width / 2., y - height, z); //glVertex3f(v3.x, v3.y, v3.z); //glVertex3f(50,50, 0);
+		CrossA.Normalize();
-	//glTexCoord2f(u + w, v + h); glVertex3f(x + width / 2., y, z); //glVertex3f(v2.x, v2.y, v2.z); //glVertex3f(50, 0, 0);
+		CrossB.Normalize();
-	//glTexCoord2f(u, v + h); glVertex3f(x - width / 2., y, z); //glVertex3f(v1.x, v1.y, v1.z);// glVertex3f(0, 0, 0);
+
-	//glEnd();
+		Vector3f playerPosition = booster->GetPosition() + Vector3f(0.f, -.75f, 0.f);
-	//shader.Disable();
+
+		Vector3f v2 = (playerPosition + CrossA * 0.5 * width + CrossB * 0.5 * height);
+		Vector3f v1 = (playerPosition - CrossA * 0.5 * width + CrossB * 0.5 * height);
+		Vector3f v3 = (playerPosition + CrossA * 0.5 * width - CrossB * 0.5 * height);
+		Vector3f v4 = (playerPosition - CrossA * 0.5 * width - CrossB * 0.5 * height);
+
+		int index;
+		BOOST_TYPE type = booster->GetType();
+
+		switch (type)
+		{
+		case BTYPE_HEAL:
+			index = 5;
+			break;
+		case BTYPE_DAMAGE:
+			index = 6;
+			break;
+		case BTYPE_SPEED:
+			index = 7;
+			break;
+		case BTYPE_INVINCIBLE:
+			index = 8;
+			break;
+		default:
+			index = 1;
+			break;
+		}
+		float u, v, w, h;
+
+		shader.Use();
+		textureAtlas.Bind();
+		textureAtlas.TextureIndexToCoord(index, u, v, w, h);
+
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendEquation(GL_FUNC_ADD);
+
+		glLoadMatrixf(tran.GetMatrix().GetInternalValues());
+		glBegin(GL_QUADS);
+		glTexCoord2f(u, v); glVertex3f(v1.x, v1.y, v1.z);
+		glTexCoord2f(u + w, v); glVertex3f(v2.x, v2.y, v2.z);
+		glTexCoord2f(u + w, v + h); glVertex3f(v3.x, v3.y, v3.z);
+		glTexCoord2f(u, v + h); glVertex3f(v4.x, v4.y, v4.z);
+
+		glEnd();
+
+		glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR);
+		glBlendEquation(GL_FUNC_SUBTRACT);
+		glDisable(GL_BLEND);
+
+		shader.Disable();
 }
 
-
-
 void Renderer::RenderPlayer(Player* player, Transformation tran) const {
 }
 

SQCSim2021/renderer.h

@@ -29,7 +29,7 @@ public:
 
 	void UpdateMesh(World* origin, const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]);
 
-	void RenderBillboard(const Vector3f pos, TextureAtlas textureAtlas, TextureAtlas::TextureIndex idx, Shader& shader, Transformation tran);
+	void RenderBooster(TextureAtlas& textureAtlas, Shader& shader, Transformation tran, Player player, Booster* booster);
 
 	void RenderWorld(World* origin, int& rendercount, const Vector3f& player_pos, const Vector3f& player_dir, Transformation world, Shader& shader, TextureAtlas& atlas) const;
 	void RenderPlayer(Player* player, Transformation tran) const;

SQCSim2021/settings.cpp

@@ -9,7 +9,7 @@ Settings::Settings(Audio& audio)
     m_fullscreen(false),
     m_brightness(0.5f),
     m_contrast(0.5f),
-    m_mouseSensitivity(0.5f) {
+    m_mouseSensitivity(0.0f) {
     ApplyResolution(m_resolution);
 }