client linux fonctionnel

.gitignore

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

SQCSim-common/define.h

@@ -22,7 +22,7 @@
 #define FRAMES_DELETE_CHUNKS 1
 
 #define THREADS_GENERATE_CHUNKS 8
-#define THREADS_UPDATE_CHUNKS 6
+#define THREADS_UPDATE_CHUNKS 3
 #define THREADS_DELETE_CHUNKS 3
 
 #define VIEW_DISTANCE 512 // Si les chunks arr<72>tent de s'afficher pendant une game et qu'il y a un access violation quand tu quitte, il faut augmenter ce chiffre.
@@ -53,6 +53,7 @@ typedef uint64_t Timestamp;
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
+#include <cstring>
 
 #define SOCKET int
 #define INVALID_SOCKET -1

SQCSim-common/player.cpp

@@ -5,7 +5,7 @@ Player::Player(const Vector3f& position, float rotX, float rotY) : m_position(po
 	m_velocity = Vector3f(0, 0, 0);
 	m_airborne = true;
 	m_hp = 0.75f; //TODO: Remettre <20> 1.0f
-	m_username = "Zelda Bee-Bop56";
+	m_username = "Zelda Bee-Bop";
 }
 
 void Player::TurnLeftRight(float value) {

SQCSim-common/world.cpp

@@ -130,7 +130,7 @@ void World::GetScope(unsigned int& x, unsigned int& y) {
 	y = m_center[1];
 }
 
-void World::Update(Bullet* bullets[MAX_BULLETS], Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]) {
+void World::Update(Bullet* bullets[MAX_BULLETS], const Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]) {
 	UpdateWorld(player_pos, blockinfo);
 	//TransposeWorld(player_pos, bullets);
 }

SQCSim-common/world.h

@@ -30,7 +30,7 @@ public:
 	BlockType BlockAt(float x, float y, float z, BlockType defaultBlockType = BTYPE_AIR) const;
 	BlockType BlockAt(const Vector3f& pos, BlockType defaultBlockType = BTYPE_AIR) const;
 
-	void Update(Bullet* bullets[MAX_BULLETS], Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]);
+	void Update(Bullet* bullets[MAX_BULLETS], const Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]);
 
 	void GetScope(unsigned int& x, unsigned int& y);
 

SQCSim-srv/cmake/CMakeLists.txt

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

SQCSim-srv/server.cpp

@@ -85,7 +85,7 @@ int Server::Ready() {
 
 	while (!readystart) {
 		sockaddr_in sockad;
-		int addrlen = sizeof(sockad);
+		unsigned int addrlen = sizeof(sockad);
 		SOCKET sock = accept(m_sock_tcp, (sockaddr*)&sockad, &addrlen);
 
 		if (sock < 0)
@@ -140,7 +140,7 @@ void Server::Run() {
 	Log("Partie en cours...", false, false);
 }
 
-inline std::string Server::Timestamp() {
+inline std::string Server::LogTimestamp() {
 	time_t rawtime;
 	struct tm timeinfo;
 	char buffer[80];
@@ -162,11 +162,11 @@ inline std::string Server::Timestamp() {
 void Server::Log(std::string str, bool is_error = false, bool is_fatal = false) {
 	switch (m_log) {
 	case LOG_DEST::LOGFILE:
-		m_logfile << Timestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
+		m_logfile << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
 		break;
 	case LOG_DEST::CONSOLE:
 	default:
-		std::cout << Timestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
+		std::cout << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
 		break;
 	}
 

SQCSim-srv/server.h

@@ -35,7 +35,7 @@ private:
 
 	World* m_world = nullptr;
 
-	std::string Timestamp();
+	std::string LogTimestamp();
 	void Log(std::string str, bool is_error, bool is_fatal);
 	void buildIdList(size_t size);
 

SQCSim2021/SQCSim2021.vcxproj

@@ -105,8 +105,8 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>external\irrKlang-1.6.0\include;external\glew210\include;external\devil180\include;external\sfml251-32\include;$(IncludePath)</IncludePath>
+    <IncludePath>external\irrKlang-1.6.0\include;external\glew210\include;external\devil178\include;external\sfml251\include;$(IncludePath)</IncludePath>
-    <LibraryPath>external\glew210\lib\Release\Win32;external\sfml251-32\lib;external\devil180\lib\x86\Release;external\irrKlang-1.6.0\lib\Win32-visualStudio;$(LibraryPath)</LibraryPath>
+    <LibraryPath>external\glew210\lib;external\sfml251\lib;external\devil178\lib;external\irrKlang-1.6.0\lib\Win32-visualStudio;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
@@ -115,8 +115,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>external\devil180\include;external\irrKlang-1.6.0\include;external\sfml251-32\include;external\glew210\include;$(IncludePath)</IncludePath>
+    <IncludePath>external\devil180\include;external\irrKlang-1.6.0\include;external\sfml251\include;external\glew210\include;$(IncludePath)</IncludePath>
-    <LibraryPath>external\sfml251-32\lib;external\devil180\lib\x86\Release;external\glew210\lib\Release\Win32;$(LibraryPath);external\irrKlang-1.6.0\lib\Win32-visualStudio</LibraryPath>
+    <LibraryPath>external\sfml251\lib;external\devil180\lib\x86\Release;external\glew210\lib\Release\Win32;$(LibraryPath);external\irrKlang-1.6.0\lib\Win32-visualStudio</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>

SQCSim2021/audio.h

@@ -1,8 +1,14 @@
 #ifndef AUDIO_H__
 #define AUDIO_H__
 
+#ifdef _WIN32
 #include <irrKlang.h>
 #include <ik_ISoundSource.h>
+#else
+#include "./external/irrKlang-64bit-1.6.0/include/irrKlang.h"
+#include "./external/irrKlang-64bit-1.6.0/include/ik_ISoundSource.h"
+#endif
+
 #include "../SQCSim-common/vector3.h"
 #include "define.h"
 

SQCSim2021/cmake/CMakeLists.txt

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

SQCSim2021/define.h

@@ -1,27 +1,29 @@
 #ifndef CLI_DEFINE_H__
 #define CLI_DEFINE_H__
 
-//#define SFML_STATIC true
-
 #include <iostream>
 #include <chrono>
 #include <iomanip>
+#include <GL/glew.h>
 #include <SFML/Window.hpp>
 #include <SFML/Graphics.hpp>
 #include "../SQCSim-common/define.h"
 
 #ifdef _WIN32
-#include <GL/glew.h>
 #include <gl/GL.h>
 #include <gl/GLU.h>
+#else
+#include <GL/gl.h>
+#include <GL/glu.h>
+#include <climits>
 #endif
 
 #define NETWORK_TEST false
 #define SRV_ADDR "127.0.0.1"
 #define COUNTDOWN 300
 
-#define BASE_WIDTH 1600
+#define BASE_WIDTH 640
-#define BASE_HEIGHT 900
+#define BASE_HEIGHT 480
 
 #define TEXTURE_PATH        "./media/textures/"
 #define SHADER_PATH		    "./media/shaders/"

SQCSim2021/docs/analyse_serveur.md

@@ -0,0 +1 @@
+

SQCSim2021/engine.cpp

@@ -1,21 +1,5 @@
 #include "engine.h"
 
-#include <iostream>
-#include <chrono>
-#include <thread>
-#include <queue>
-
-// Define a structure to represent notifications
-struct Notification {
-	std::string message;
-	float displayStartTime = 0.0f;
-};
-
-// Use a queue to manage notifications
-//std::queue<Notification> notificationQueue;
-// Use a vector to manage notifications
-std::vector<Notification> notifications;
-
 Engine::Engine() {}
 
 Engine::~Engine() {
@@ -94,9 +78,6 @@ void Engine::LoadResource() {
 	LoadTexture(m_textureCrosshair, TEXTURE_PATH "cross.bmp", true);
 	LoadTexture(m_textureFont, TEXTURE_PATH "font.bmp", true);
 	LoadTexture(m_textureGun, TEXTURE_PATH "gun01.png", false);
-	LoadTexture(m_texturePovGun, TEXTURE_PATH "GUN.png", false);
-	LoadTexture(m_textureSoloMultiMenu, TEXTURE_PATH "single_multi.png", false);
-	LoadTexture(m_textureTitle, TEXTURE_PATH "title.png", false);
 
 	TextureAtlas::TextureIndex texDirtIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "metal3.png");
 	TextureAtlas::TextureIndex texIceIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "metal2.png");
@@ -132,89 +113,6 @@ void Engine::LoadResource() {
 
 void Engine::UnloadResource() {}
 
-void Engine::SystemNotification(std::string systemLog) {
-	std::string message = "";
-
-	message = systemLog;
-
-	DisplayNotification(message);
-}
-void Engine::KillNotification(Player killer, Player killed) {
-	std::string message = "";
-
-	message = killed.GetUsername() + " killed by -> " + killer.GetUsername();
-
-	DisplayNotification(message);
-}
-
-void Engine::DisplayNotification(std::string message) {
-
-	if (message.length() > 45) {
-		message = message.substr(0, 45);
-	}
-	// Create a new notification and add it to the queue
-	Notification newNotification;
-	newNotification.message = message;
-	newNotification.displayStartTime = m_time;
-
-	notifications.push_back(newNotification);
-}
-
-// Add a method to process the notification queue
-void Engine::ProcessNotificationQueue() {
-	//PrintText(fPosX, fUsernamePosY, ss.str(), 1.5f);
-	//float fPosX = (Width() / 100.0f) * scaleX;
-	//float fPosY = Height() - (Height() * 0.05) * scaleY;
-
-	m_textureFont.Bind();
-
-	auto [scaleX, scaleY] = GetScale();
-
-	float xOffset = (Width() / 1.5f) * scaleX;
-	float yOffset = (Height() / 1.2f) * scaleY;
-
-	for (auto it = notifications.begin(); it != notifications.end(); ) {
-		float timeSinceDisplay = m_time - it->displayStartTime;
-
-		float y = yOffset - (20.0f * scaleX * (it - notifications.begin()));
-
-		glDisable(GL_STENCIL_TEST);
-		glDisable(GL_DEPTH_TEST);
-
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-		glBlendEquation(GL_FUNC_ADD);
-
-		glMatrixMode(GL_PROJECTION);
-		glPushMatrix();
-
-		glLoadIdentity();
-		glOrtho(0, Width(), 0, Height(), -1, 1);
-
-		glMatrixMode(GL_MODELVIEW);
-		glPushMatrix();
-
-		PrintText(xOffset, y, it->message);
-
-		glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR);
-		glBlendEquation(GL_FUNC_SUBTRACT);
-
-		glEnable(GL_STENCIL_TEST);
-		glEnable(GL_DEPTH_TEST);
-
-		glMatrixMode(GL_PROJECTION);
-		glPopMatrix();
-		glMatrixMode(GL_MODELVIEW);
-		glPopMatrix();
-
-		if (timeSinceDisplay >= 4.0f) {
-			it = notifications.erase(it);
-		}
-		else {
-			++it;
-		}
-	}
-}
-
 void Engine::DisplayCrosshair() {
 	m_textureCrosshair.Bind();
 	static const int crossSize = 32;
@@ -232,126 +130,61 @@ void Engine::DisplayCrosshair() {
 	glEnd();
 }
 
-void Engine::DisplayPovGun() {
-	// Setter le blend function, tout ce qui sera noir sera transparent
-	glDisable(GL_STENCIL_TEST);
-	glDisable(GL_DEPTH_TEST);
-
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glBlendEquation(GL_FUNC_ADD);
-
-	glMatrixMode(GL_PROJECTION);
-	glPushMatrix();
-
-	glLoadIdentity();
-	glOrtho(0, Width(), 0, Height(), -1, 1);
-
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
-
-	float scaleX = (Width()) / BASE_WIDTH;
-	float scaleY = (Height()) / BASE_HEIGHT;
-	float baseXOffset = 0.4958 * BASE_WIDTH;
-	float baseWidth = 0.4688 * BASE_WIDTH;
-	float baseHeight = 0.5787 * BASE_HEIGHT;
-	float xTranslation = baseXOffset * scaleX;
-	float quadWidth = baseWidth * scaleX;
-	float quadHeight = baseHeight * scaleY;
-
-	m_texturePovGun.Bind();
-	glLoadIdentity();
-	glTranslated(xTranslation, 0, 0);
-	glBegin(GL_QUADS);
-	glTexCoord2f(0, 0);
-	glVertex2i(0, 0);
-	glTexCoord2f(1, 0);
-	glVertex2i(quadWidth, 0);
-	glTexCoord2f(1, 1);
-	glVertex2i(quadWidth, quadHeight);
-	glTexCoord2f(0, 1);
-	glVertex2i(0, quadHeight);
-	glEnd();
-
-	// Reset du blend function
-	glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR);
-	glBlendEquation(GL_FUNC_SUBTRACT);
-
-	glEnable(GL_STENCIL_TEST);
-	glEnable(GL_DEPTH_TEST);
-
-	glMatrixMode(GL_PROJECTION);
-	glPopMatrix();
-
-	glMatrixMode(GL_MODELVIEW);
-	glPopMatrix();
-}
-
 void Engine::DisplayCurrentItem() {
 }
 
 void Engine::DisplayHud(int timer) {
 	glBindTexture(GL_TEXTURE_2D, 0);
 	glLoadIdentity();
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glDisable(GL_BLEND);
-	auto [scaleX, scaleY] = GetScale();
-
-	float fBackPosX = (Width() / 25.0f) * scaleX;
-	float fBackPosY = (Height() - (Height() * 0.815) * scaleY);
-	float fBackWidth = (Width() / 4.0f) * scaleX;
-	float fBackHeight = (Height() / 5.5f) * scaleY;
-
-	glColor4f(1.0f, 1.0f, 1.0f, 0.2f);
-	glBegin(GL_QUADS);
-	glVertex2f(fBackPosX, fBackPosY);
-	glVertex2f(fBackPosX + fBackWidth, fBackPosY);
-	glVertex2f(fBackPosX + fBackWidth, fBackPosY + fBackHeight);
-	glVertex2f(fBackPosX, fBackPosY + fBackHeight);
-	glEnd();
-
-	// HP Bar
-	float fBarWidth = (Width() / 4.0f) * scaleX;
-	float fBarHeight = (Height() / 25.0f) * scaleY;
-	float fPosX = (Width() / 25.0f) * scaleX;
-	float fBarPosY = (Height() - (Height() * 0.775) * scaleY);
 
+	// Barre HP
+	float fBarWidth = Width() / 4;
+	float fBarHeight = Height() / 25;
+	float fPosX = Width() / 20;
+	float fPosY = Height() - (Height() - (fBarHeight * 4));
 	float playerHp = m_player.GetHP();
 	float facteurOmbrage = m_displayInfo ? 0.5f : 1.0f;
 
-	// HP Bar Background
+	// Arri<EFBFBD>re-plan (Barre HP)
 	glColor3f(1.0f * facteurOmbrage, 1.0f * facteurOmbrage, 1.0f * facteurOmbrage);
 	glBegin(GL_QUADS);
-	glVertex2f(fPosX, fBarPosY - fBarHeight);
+		glVertex2f(fPosX, fPosY - fBarHeight);				// Bas-Gauche
-	glVertex2f(fPosX + fBarWidth, fBarPosY - fBarHeight);
+		glVertex2f(fPosX + fBarWidth, fPosY - fBarHeight);  // Bas-Droite
-	glVertex2f(fPosX + fBarWidth, fBarPosY);
+		glVertex2f(fPosX + fBarWidth, fPosY);				// Haut-Droite
-	glVertex2f(fPosX, fBarPosY);
+		glVertex2f(fPosX, fPosY);							// Haut-Gauche
 	glEnd();
 
-	// Current HP
+	//TODO: Associer avec m<>chanique de vie du joueur
+
+	// Barre HP
 	glColor3f(0.0f * facteurOmbrage, 1.0f * facteurOmbrage, 0.0f * facteurOmbrage);
 	glBegin(GL_QUADS);
-	glVertex2f(fPosX, fBarPosY - fBarHeight);
+		glVertex2f(fPosX, fPosY - fBarHeight);							// Bas-Gauche
-	glVertex2f(fPosX + fBarWidth * playerHp, fBarPosY - fBarHeight);
+		glVertex2f(fPosX + fBarWidth * playerHp, fPosY - fBarHeight);	// Bas-Droite
-	glVertex2f(fPosX + fBarWidth * playerHp, fBarPosY);
+		glVertex2f(fPosX + fBarWidth * playerHp, fPosY);				// Haut-Droite
-	glVertex2f(fPosX, fBarPosY);
+		glVertex2f(fPosX, fPosY);										// Haut-Gauche
 	glEnd();
 
-	// Equip Bar
+	// Barre <20>quip
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glColor3f(1.0f * facteurOmbrage, 1.0f * facteurOmbrage, 1.0f * facteurOmbrage);
-
-	float fEquipWidth = (Width() * 0.175f) * scaleX;
-	float fEquipHeight = (fEquipWidth / 2.5) * scaleY;
-	float fEquipPosY = (Height() - (Height() * 0.765) * scaleY);
-
-	glTranslatef(fPosX, fEquipPosY, 0);
-
 	m_textureGun.Bind();
+
+	float margin = Width() * 0.05;
+	float itemWidth = Width() * 0.33;
+	float itemHeight = itemWidth / 2.208;
+	float startX = Width() - itemWidth - margin;
+	float startY = margin;
+
+	glTranslated(startX, startY, 0);
+
 	glBegin(GL_QUADS);
-	glTexCoord2f(0, 0); glVertex2i(0, 0);
+	glTexCoord2f(1, 0); glVertex2i(0, 0);
-	glTexCoord2f(1, 0); glVertex2i(fEquipWidth, 0);
+	glTexCoord2f(0, 0); glVertex2i(itemWidth, 0);
-	glTexCoord2f(1, 1); glVertex2i(fEquipWidth, fEquipHeight);
+	glTexCoord2f(0, 1); glVertex2i(itemWidth, itemHeight);
-	glTexCoord2f(0, 1); glVertex2i(0, fEquipHeight);
+	glTexCoord2f(1, 1); glVertex2i(0, itemHeight);
 	glEnd();
 
 	glDisable(GL_BLEND);
@@ -359,161 +192,54 @@ void Engine::DisplayHud(int timer) {
 	// Username
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-	glColor3f(1.0f, 1.0f, 1.0f);
 
+	glColor3f(1.0f, 1.0f, 1.0f);
+	float scale = GetScale();
 	m_textureFont.Bind();
 	std::ostringstream ss;
-	float fUsernamePosY = fBarPosY - (fBarHeight * 2) * scaleY;
-
-	ss.str("");
 	ss << m_player.GetUsername();
-	PrintText(fPosX, fUsernamePosY, ss.str(), 1.5f);
+	PrintText(fPosX, fPosY, scale, ss.str());
 
-	ss.str("");
+	//Countdown
-	ss << m_player.GetHP() * 100 << "%";
-	PrintText(fPosX * 6.25, fUsernamePosY, ss.str(), 1.5f);
-
-	// Countdown
 	ss.str("");
 	ss << "Time: " << (int)(timer / 60) << ":" << std::setw(2) << std::setfill('0') << timer % 60;
-	PrintText(Width() - (Width() * 0.2f) * scaleX, Height() - (Height() * 0.1) * scaleY, ss.str(), 2.0f);
+	PrintText(Width() - Width() * 0.15, Height() - (Height() / 19.2), scale, ss.str());
+	
 }
 
 void Engine::DisplayInfo(float elapsedTime, BlockType bloc) {
+	// Bind de la texture pour le font
 	m_textureFont.Bind();
 	std::ostringstream ss;
 
-	auto [scaleX, scaleY] = GetScale();
+	float scale = GetScale();
-
+	unsigned int x = Width() / 25;
-	float fPosX = (Width() / 100.0f) * scaleX;
-	float fPosY = Height() - (Height() * 0.05) * scaleY;
-	float charSize = 20 + (24 - 20) * (Width() - 1600) / (1920 - 1600);
 
 	ss << " Fps : " << GetFps(elapsedTime);
-	PrintText(fPosX, fPosY, ss.str());
+	PrintText(x, Height() - (Height() / 19.2), scale, ss.str());
 	ss.str("");
-	fPosY -= charSize;
-
 	ss << " Rendered Chunks : " << m_renderCount;
-	PrintText(fPosX, fPosY, ss.str());
+	PrintText(x, Height() - (Height() / 13.7), scale, ss.str());
 	ss.str("");
-	fPosY -= charSize;
-
 	ss << " To-Be-Deleted Chunks : " << m_world.GettbDeleted();
-	PrintText(fPosX, fPosY, ss.str());
+	PrintText(x, Height() - (Height() / 10.7), scale, ss.str());
 	ss.str("");
-	fPosY -= charSize;
+	ss << " Velocity  : " << m_player.GetVelocity(); // IMPORTANT : on utilise l <20> operateur << pour afficher la position
-
+	PrintText(x, Height() / 48, scale, ss.str());
-	float fPosYJump = ((Height() - (Height() * 0.9f)) * scaleY);
-	fPosY = fPosYJump;
-	fPosY -= charSize;
-
-	ss << " Velocity  : " << m_player.GetVelocity();
-	PrintText(fPosX, fPosY, ss.str());
 	ss.str("");
-	fPosY -= charSize;
-
 	ss << " Direction : " << m_player.GetDirection();
-	PrintText(fPosX, fPosY, ss.str());
+	PrintText(x, Height() / 24, scale, ss.str());
 	ss.str("");
-	fPosY -= charSize;
-
 	ss << " Position  : " << m_player.GetPosition();
-	PrintText(fPosX, fPosY, ss.str());
+	PrintText(x, Height() / 16, scale, ss.str());
 	ss.str("");
-	fPosY -= charSize;
-
 	ss << " Block  : ";
+
 	if (bloc == BTYPE_LAST)
-		ss << "Weapon";
+		ss << "Weapon.";
-	else
+	else ss << (int)bloc;
-		ss << (int)bloc;
-	PrintText(fPosX, fPosYJump, ss.str());
-}
 
-void Engine::DisplaySingleOrMultiplayerMenu() {
+	PrintText(x, Height() / 12, scale, ss.str());
-	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glBlendEquation(GL_FUNC_ADD);
-
-	glDisable(GL_STENCIL_TEST);
-	glDisable(GL_DEPTH_TEST);
-
-	glMatrixMode(GL_PROJECTION);
-	glPushMatrix();
-
-	glLoadIdentity();
-	glOrtho(0, Width(), 0, Height(), -1, 1);
-
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
-
-	auto [scaleX, scaleY] = GetScale();
-	float fBackPosX = 0.0f;
-	float fBackPosY = 0.0f;
-	float fBackWidth = Width();
-	float fBackHeight = Height();
-
-	m_textureSoloMultiMenu.Bind();
-	glBegin(GL_QUADS);
-	glTexCoord2f(0.0f, 0.0f); glVertex2f(fBackPosX, fBackPosY);
-	glTexCoord2f(1.0f, 0.0f); glVertex2f(fBackWidth, fBackPosY);
-	glTexCoord2f(1.0f, 1.0f); glVertex2f(fBackWidth, fBackHeight);       
-	glTexCoord2f(0.0f, 1.0f); glVertex2f(fBackPosX, fBackHeight);   
-	glEnd();
-
-	float centerX = (Width() / 2.0f);
-	float centerY = (Height() / 2.0f);
-	float titleWidth = (centerX * 1.85f) * scaleX;
-	float titleHeight = (centerY * 1.85f) * scaleY;
-
-	// Solo game indicator
-	m_textureTitle.Bind();
-	glBegin(GL_QUADS);
-	glTexCoord2f(0.0f, 0.0f); glVertex2f(centerX, centerY); 
-	glTexCoord2f(1.0f, 0.0f); glVertex2f(titleWidth, centerY);
-	glTexCoord2f(1.0f, 1.0f); glVertex2f(titleWidth, titleHeight); 
-	glTexCoord2f(0.0f, 1.0f); glVertex2f(centerX, titleHeight);
-	glEnd();
-
-	glBindTexture(GL_TEXTURE_2D, 0);
-
-	// Solo game indicator
-	float fPosX = (centerX * 1.1f) * scaleX;
-	float fPosXWidth = (centerX * 1.75f) * scaleX;
-	float soloPosY = (centerY * 0.75f) * scaleY;
-	float soloHeight = (centerY * 0.9f) * scaleY;
-
-	glColor4f(1.0f, 1.0f, 1.0f, 0.5f);
-	glBegin(GL_QUADS);
-	glTexCoord2f(0.0f, 0.0f); glVertex2f(fPosX, soloPosY); 
-	glTexCoord2f(1.0f, 0.0f); glVertex2f(fPosXWidth, soloPosY); 
-	glTexCoord2f(1.0f, 1.0f); glVertex2f(fPosXWidth, soloHeight); 
-	glTexCoord2f(0.0f, 1.0f); glVertex2f(fPosX, soloHeight);
-	glEnd();
-
-	// Multiplayer game indicator
-	float multiPosY = (centerY * 0.5f) * scaleY;
-	float multiHeight = (centerY * 0.65f) * scaleY;
-
-	glBegin(GL_QUADS);
-	glTexCoord2f(0.0f, 0.0f); glVertex2f(fPosX, multiPosY);
-	glTexCoord2f(1.0f, 0.0f); glVertex2f(fPosXWidth, multiPosY); 
-	glTexCoord2f(1.0f, 1.0f); glVertex2f(fPosXWidth, multiHeight);
-	glTexCoord2f(0.0f, 1.0f); glVertex2f(fPosX, multiHeight); 
-	glEnd();
-
-	// TODO: Add SOLO / MULTIPLAYER text with font
-	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-
-	glEnable(GL_STENCIL_TEST);
-	glEnable(GL_DEPTH_TEST);
-
-	glMatrixMode(GL_PROJECTION);
-	glPopMatrix();
-
-	glMatrixMode(GL_MODELVIEW);
-	glPopMatrix();
 }
 
 void Engine::DrawHud(float elapsedTime, BlockType bloc) {
@@ -535,16 +261,6 @@ void Engine::DrawHud(float elapsedTime, BlockType bloc) {
 
 	int timer = GetCountdown(elapsedTime);
 
-	if (m_keyK) {
-		SystemNotification(m_messageNotification);
-		m_keyK = false;
-	}
-	if (m_keyL) {
-
-		KillNotification(m_player, m_player);
-		m_keyL = false;
-	}
-
 	if (m_displayInfo) {
 		DisplayInfo(elapsedTime, bloc);
 	}
@@ -557,6 +273,7 @@ void Engine::DrawHud(float elapsedTime, BlockType bloc) {
 		DisplayCrosshair();
 	}
 
+	// Reset du blend function
 	glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR);
 	glBlendEquation(GL_FUNC_SUBTRACT);
 
@@ -570,36 +287,31 @@ void Engine::DrawHud(float elapsedTime, BlockType bloc) {
 	glPopMatrix();
 }
 
-void Engine::PrintText(float x, float y, const std::string& t, float charSizeMultiplier) {
+void Engine::PrintText(float x, float y, float scale, const std::string& t) {
-	auto [scaleX, scaleY] = GetScale();
-	float scale = std::min(scaleX, scaleY);
-
-	float baseCharSize = 20 + (24 - 20) * (Width() - 1600) / (1920 - 1600);
-	float charSize = baseCharSize * charSizeMultiplier;
-
 	glLoadIdentity();
 	glTranslated(x, y, 0);
 
 	for (unsigned int i = 0; i < t.length(); ++i) {
 		float left = (float)((t[i] - 32) % 16) / 16.f;
 		float top = (float)((t[i] - 32) / 16) / 16.f;
-		top += 0.5f;
+		top += .5f;
 
 		glBegin(GL_QUADS);
 			glTexCoord2f(left, 1.f - top - .0625f);			 glVertex2f(0, 0);
-		glTexCoord2f(left + .0625f, 1.f - top - .0625f); glVertex2f(charSize * scale, 0);
+			glTexCoord2f(left + .0625f, 1.f - top - .0625f); glVertex2f(12 * scale, 0);
-		glTexCoord2f(left + .0625f, 1.f - top);          glVertex2f(charSize * scale, charSize * scale);
+			glTexCoord2f(left + .0625f, 1.f - top);			 glVertex2f(12 * scale, 12 * scale);
-		glTexCoord2f(left, 1.f - top);                   glVertex2f(0, charSize * scale);
+			glTexCoord2f(left, 1.f - top);					 glVertex2f(0, 12 * scale);
 		glEnd();
 
-		glTranslated(0.5555f * charSize * scale, 0, 0);
+		glTranslated(8 * scale, 0, 0);
 	}
 }
 
-std::pair<float, float> Engine::GetScale() const {
+float Engine::GetScale() const {
-	float widthRatio = static_cast<float>(Width()) / BASE_WIDTH;
+	float widthRatio = Width() / BASE_WIDTH;
-	float heightRatio = static_cast<float>(Height()) / BASE_HEIGHT;
+	float heightRatio = Height() / BASE_HEIGHT;
-	return { widthRatio, heightRatio };
+
+	return (widthRatio + heightRatio) / 2.0f;
 }
 
 int Engine::GetFps(float elapsedTime) const { return 1 / elapsedTime; }
@@ -611,7 +323,7 @@ int Engine::GetCountdown(float elapsedTime) {
 	}
 	if (m_countdown < m_time)
 		Stop();
-	if (!m_stopcountdown)
+	if(!m_stopcountdown)
 		m_time += elapsedTime;
 	return m_countdown - (int)m_time;
 }
@@ -711,14 +423,7 @@ void Engine::Render(float elapsedTime) {
 
 	if (m_isSkybox) m_skybox.Render(skybox);
 
-
 	DrawHud(elapsedTime, bloc);
-	DisplayPovGun();
-	ProcessNotificationQueue();
-
-	/*if (m_soloMultiChoiceMade) {
-		DisplaySingleOrMultiplayerMenu();
-	}*/
 	
 	static bool fell = false;
 	if (m_player.GetPosition().y < 1.7f && !fell) {
@@ -769,13 +474,6 @@ void Engine::KeyPressEvent(unsigned char key) {
 		break;
 	case 5: // F - Ignorer
 		break;
-	case 10: // K - Debugging DisplayNotification()
-		m_keyK = true;
-		m_messageNotification = "notifications systeme peuvent <20>tre affich<63>";
-		break;
-	case 11: // L - Debugging DisplayNotification()
-		m_keyL = true;
-		break;
 	case 6: // G - Ignorer
 		break;
 	case 12: // M - Ignorer
@@ -824,12 +522,6 @@ void Engine::KeyReleaseEvent(unsigned char key) {
 		m_displayInfo = !m_displayInfo;
 		std::cout << "DISPLAY INFO " << (m_displayInfo ? "enabled" : "disabled") << std::endl;
 		break;
-	case 10: // K
-		m_keyK = false;
-		break;
-	case 11: // L - Debugging DisplayNotification()
-		m_keyL = false;
-		break;
 	case 12: // M - Toggle music
 		m_audio.ToggleMusicState();
 		break;

SQCSim2021/engine.h

@@ -36,25 +36,19 @@ public:
     virtual void MouseReleaseEvent(const MOUSE_BUTTON &button, int x, int y);
 
 private:
-    std::pair<float, float> GetScale() const;
+    float GetScale() const;
 
     int GetFps(float elapsedTime) const;
     int GetCountdown(float elapsedTime);
 
     bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true);
 
-    void SystemNotification(std::string systemLog);
-    void KillNotification(Player killer, Player killed);
-    void DisplayNotification(std::string message);
-    void ProcessNotificationQueue();
     void DisplayCrosshair();
-    void DisplayPovGun();
     void DisplayCurrentItem();
     void DisplayHud(int timer);
     void DisplayInfo(float elapsedTime, BlockType bloc);
-    void DisplaySingleOrMultiplayerMenu();
     void DrawHud(float elapsedTime, BlockType bloc);
-    void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
+    void PrintText(float x, float y, float scale, const std::string& t);
 
     Connector m_conn;
     Shader m_shader01;
@@ -64,13 +58,10 @@ private:
     World m_world = World();
     WorldRenderer m_wrenderer = WorldRenderer();
 
-    Texture m_textureCrosshair;
-    Texture m_textureFont;
-    Texture m_textureGun;
-    Texture m_texturePovGun;
     Texture m_textureSkybox;
-    Texture m_textureSoloMultiMenu;
+    Texture m_textureFont;
-    Texture m_textureTitle;
+    Texture m_textureCrosshair;
+    Texture m_textureGun;
 
     Skybox m_skybox;
     Audio m_audio = Audio(AUDIO_PATH "start.wav");
@@ -96,11 +87,8 @@ private:
     bool m_displayHud = true;
     bool m_displayInfo = false;
     bool m_resetcountdown = false;
-    bool m_soloMultiChoiceMade = true;
     bool m_stopcountdown = false;
     
-    bool m_keyK = false;
-    bool m_keyL = false;
     bool m_keyW = false;
     bool m_keyA = false;
     bool m_keyS = false;
@@ -111,8 +99,6 @@ private:
     bool m_mouseC = false;
     bool m_mouseWU = false;
     bool m_mouseWD = false;
-
-    std::string m_messageNotification = "";
 };
 
 #endif // ENGINE_H__

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

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