On l'a eu!

SQC-8_Messagerie

.gitignore

@@ -373,8 +373,3 @@ 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 3
+#define THREADS_UPDATE_CHUNKS 6
 #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,7 +53,6 @@ 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-Bop";
+	m_username = "Zelda Bee-Bop56";
 }
 
 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], const Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]) {
+void World::Update(Bullet* bullets[MAX_BULLETS], Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]) {
 	UpdateWorld(player_pos, blockinfo);
 	//TransposeWorld(player_pos, bullets);
 }
@@ -407,4 +407,4 @@ void World::UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]
 	}*/
 }
 
-int World::GettbDeleted() const { return m_tbDeleted.size(); }
+int World::GettbDeleted() const { return m_tbDeleted.size(); }

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], const Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]);
+	void Update(Bullet* bullets[MAX_BULLETS], Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]);
 
 	void GetScope(unsigned int& x, unsigned int& y);
 

SQCSim-srv/cmake/CMakeLists.txt

@@ -1,30 +0,0 @@
-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/define.h

@@ -14,4 +14,4 @@
 typedef unsigned char LogDest;
 enum LOG_DEST { CONSOLE, LOGFILE, LOG_LAST };
 
-#endif
+#endif

SQCSim-srv/server.cpp

@@ -85,7 +85,7 @@ int Server::Ready() {
 
 	while (!readystart) {
 		sockaddr_in sockad;
-		unsigned int addrlen = sizeof(sockad);
+		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::LogTimestamp() {
+inline std::string Server::Timestamp() {
 	time_t rawtime;
 	struct tm timeinfo;
 	char buffer[80];
@@ -162,11 +162,11 @@ inline std::string Server::LogTimestamp() {
 void Server::Log(std::string str, bool is_error = false, bool is_fatal = false) {
 	switch (m_log) {
 	case LOG_DEST::LOGFILE:
-		m_logfile << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
+		m_logfile << Timestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
 		break;
 	case LOG_DEST::CONSOLE:
 	default:
-		std::cout << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
+		std::cout << Timestamp() << (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 LogTimestamp();
+	std::string Timestamp();
 	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\devil178\include;external\sfml251\include;$(IncludePath)</IncludePath>
+    <IncludePath>external\irrKlang-1.6.0\include;external\glew210\include;external\devil180\include;external\sfml251-32\include;$(IncludePath)</IncludePath>
-    <LibraryPath>external\glew210\lib;external\sfml251\lib;external\devil178\lib;external\irrKlang-1.6.0\lib\Win32-visualStudio;$(LibraryPath)</LibraryPath>
+    <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>
   </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\include;external\glew210\include;$(IncludePath)</IncludePath>
+    <IncludePath>external\devil180\include;external\irrKlang-1.6.0\include;external\sfml251-32\include;external\glew210\include;$(IncludePath)</IncludePath>
-    <LibraryPath>external\sfml251\lib;external\devil180\lib\x86\Release;external\glew210\lib\Release\Win32;$(LibraryPath);external\irrKlang-1.6.0\lib\Win32-visualStudio</LibraryPath>
+    <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>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>

SQCSim2021/audio.h

@@ -1,14 +1,8 @@
 #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"
 
@@ -35,4 +29,4 @@ public:
 	void PauseEngine();
 };
 
-#endif // AUDIO_H__
+#endif // AUDIO_H__

SQCSim2021/cmake/CMakeLists.txt

@@ -1,68 +0,0 @@
-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,21 +1,19 @@
 #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
@@ -29,5 +27,6 @@
 #define SHADER_PATH		    "./media/shaders/"
 #define AUDIO_PATH			"./media/audio/"
 #define CHUNK_PATH			"./media/chunks/"
+#define MENU_ITEM_PATH		"./media/menu_items/"
 
 #endif // DEFINE_H__

SQCSim2021/docs/analyse_serveur.md

@@ -1 +0,0 @@
-

SQCSim2021/engine.cpp

@@ -1,5 +1,23 @@
 #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() {
@@ -10,6 +28,200 @@ Engine::~Engine() {
 				m_world.GetChunks().Get(x, y)->~Chunk();
 }
 
+void Engine::DrawMenu()
+{
+	static const int sTitle = 400;
+	static const int sButton = 225;
+
+	glDisable(GL_LIGHTING);
+	
+
+	glDisable(GL_DEPTH_TEST);
+	glDisable(GL_STENCIL_TEST);
+	glMatrixMode(GL_PROJECTION);
+	glPushMatrix();
+	glLoadIdentity();
+	glOrtho(0, Width(), 0, Height(), -1, 1);
+	glMatrixMode(GL_MODELVIEW);
+	glPushMatrix();
+
+	MenuBGTexture.Bind();
+	glLoadIdentity();
+	glBegin(GL_QUADS);
+	glTexCoord2f(0, 0);
+	glVertex2i(0, 0);
+	glTexCoord2f(1, 0);
+	glVertex2i(800, 0);
+	glTexCoord2f(1, 1);
+	glVertex2i(800, 600);
+	glTexCoord2f(0, 1);
+	glVertex2i(0, 600);
+	glEnd();
+
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendEquation(GL_FUNC_ADD);
+	glEnable(GL_BLEND);
+
+	if (m_gamestate != GameState::OPTIONS)
+	{
+		MenuTitleTexture.Bind();
+		glTranslated(200, 300, 0);
+		glBegin(GL_QUADS);
+		glTexCoord2f(0, 0);
+		glVertex2i(0, 200);
+		glTexCoord2f(1, 0);
+		glVertex2i(sTitle, 200);
+		glTexCoord2f(1, 1);
+		glVertex2i(sTitle, 300);
+		glTexCoord2f(0, 1);
+		glVertex2i(0, 300);
+		glEnd();
+
+		MenuStartTexture.Bind();
+		glTranslated(80, -225, 0);
+		glBegin(GL_QUADS);
+		glTexCoord2f(0, 0);
+		glVertex2i(0, 100);
+		glTexCoord2f(1, 0);
+		glVertex2i(sButton, 100);
+		glTexCoord2f(1, 1);
+		glVertex2i(sButton, 200);
+		glTexCoord2f(0, 1);
+		glVertex2i(0, 200);
+		glEnd();
+
+		/*MenuResumeTexture.Bind();
+		glTranslated(0, -100, 0);
+		glBegin(GL_QUADS);
+		glTexCoord2f(0, 0);
+		glVertex2i(0, 125);
+		glTexCoord2f(1, 0);
+		glVertex2i(sButton, 125);
+		glTexCoord2f(1, 1);
+		glVertex2i(sButton, 200);
+		glTexCoord2f(0, 1);
+		glVertex2i(0, 200);
+		glEnd();*/
+
+		/*MenuOptionsTexture.Bind();
+		glTranslated(0, -100, 0);
+		glBegin(GL_QUADS);
+		glTexCoord2f(0, 0);
+		glVertex2i(0, 125);
+		glTexCoord2f(1, 0);
+		glVertex2i(sButton, 125);
+		glTexCoord2f(1, 1);
+		glVertex2i(sButton, 200);
+		glTexCoord2f(0, 1);
+		glVertex2i(0, 200);
+		glEnd();*/
+
+		MenuQuitTexture.Bind();
+		glTranslated(0, -100, 0);
+		glBegin(GL_QUADS);
+		glTexCoord2f(0, 0);
+		glVertex2i(0, 100);
+		glTexCoord2f(1, 0);
+		glVertex2i(sButton, 100);
+		glTexCoord2f(1, 1);
+		glVertex2i(sButton, 200);
+		glTexCoord2f(0, 1);
+		glVertex2i(0, 200);
+		glEnd();
+
+	}
+	else
+	{
+		/*MenuOptionsTexture.Bind();
+		glTranslated(200, 0, 0);
+		glBegin(GL_QUADS);
+		glTexCoord2f(0, 0);
+		glVertex2i(0, 0);
+		glTexCoord2f(1, 0);
+		glVertex2i(sTitle, 0);
+		glTexCoord2f(1, 1);
+		glVertex2i(sTitle, 200);
+		glTexCoord2f(0, 1);
+		glVertex2i(0, 200);
+		glEnd();
+
+		WireFrameTexture.Bind();
+		glTranslated(0, 300, 0);
+		glBegin(GL_QUADS);
+		glTexCoord2f(0, 0);
+		glVertex2i(0, 125);
+		glTexCoord2f(1, 0);
+		glVertex2i(sButton, 125);
+		glTexCoord2f(1, 1);
+		glVertex2i(sButton, 200);
+		glTexCoord2f(0, 1);
+		glVertex2i(0, 200);
+		glEnd();
+
+		OnOffBtnTexture.Bind();
+		glTranslated(200, 0, 0);
+		glBegin(GL_QUADS);
+		glTexCoord2f(0, 0);
+		glVertex2i(0, 125);
+		glTexCoord2f(1, 0);
+		glVertex2i(sButton, 125);
+		glTexCoord2f(1, 1);
+		glVertex2i(sButton, 200);
+		glTexCoord2f(0, 1);
+		glVertex2i(0, 200);
+		glEnd();
+		glTranslated(-400, -300, 0);
+
+		MusicTexture.Bind();
+		glTranslated(200, 200, 0);
+		glBegin(GL_QUADS);
+		glTexCoord2f(0, 0);
+		glVertex2i(0, 125);
+		glTexCoord2f(1, 0);
+		glVertex2i(sButton, 125);
+		glTexCoord2f(1, 1);
+		glVertex2i(sButton, 200);
+		glTexCoord2f(0, 1);
+		glVertex2i(0, 200);
+		glEnd();
+
+		OnOffBtnTexture.Bind();
+		glTranslated(200, 0, 0);
+		glBegin(GL_QUADS);
+		glTexCoord2f(0, 0);
+		glVertex2i(0, 125);
+		glTexCoord2f(1, 0);
+		glVertex2i(sButton, 125);
+		glTexCoord2f(1, 1);
+		glVertex2i(sButton, 200);
+		glTexCoord2f(0, 1);
+		glVertex2i(0, 200);
+		glEnd();
+
+		BackBtnTexture.Bind();
+		glTranslated(-375, 175, 0);
+		glBegin(GL_QUADS);
+		glTexCoord2f(0, 0);
+		glVertex2i(0, 140);
+		glTexCoord2f(1, 0);
+		glVertex2i(sButton, 140);
+		glTexCoord2f(1, 1);
+		glVertex2i(sButton, 200);
+		glTexCoord2f(0, 1);
+		glVertex2i(0, 200);
+		glEnd();*/
+	}
+
+	//glEnable(GL_LIGHTING);
+	glDisable(GL_BLEND);
+	glEnable(GL_DEPTH_TEST);
+	glMatrixMode(GL_PROJECTION);
+	glPopMatrix();
+	glMatrixMode(GL_MODELVIEW);
+	glPopMatrix();
+	ShowCursor();
+}
+
 void Engine::Init() {
 	GLenum glewErr = glewInit();
 	if (glewErr != GLEW_OK) {
@@ -35,6 +247,7 @@ void Engine::Init() {
 	glDisable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glBlendEquation(GL_FUNC_SUBTRACT);
+	
 	// 
 	// Objet de skybox avec sa propre texture et son propre shader!
 	m_skybox.Init(0.2f);
@@ -47,18 +260,18 @@ void Engine::Init() {
 		m_bullets[x] = nullptr;
 
 	uint64_t seed = SEED;
-	std::string playname = "La Chienne <20> Jacques";
+	std::string playname = "La Chienne <20> Jacques";
-	if (NETWORK_TEST) { // Test connexion r<>seau.
+	if (NETWORK_TEST) { // Test connexion r<>seau.
 		if (!m_conn.Init()) {
 			if (!m_conn.Connect(SRV_ADDR, playname)) {
-				// setup jeu en r<>seau.
+				// setup jeu en r<>seau.
-				std::cout << "ID re<72>u du serveur: " << std::to_string(m_conn.getId()) << "!" << std::endl;
+				std::cout << "ID re<72>u du serveur: " << std::to_string(m_conn.getId()) << "!" << std::endl;
-				std::cout << "Seed re<72>u du serveur: " << std::to_string(m_conn.getSeed()) << "!" << std::endl;
+				std::cout << "Seed re<72>u du serveur: " << std::to_string(m_conn.getSeed()) << "!" << std::endl;
 				seed = m_conn.getSeed();
 			}
 			else std::cout << "Erreur de connexion." << std::endl;
 		}
-		else std::cout << "Erreur de cr<63>ation de socket." << std::endl;
+		else std::cout << "Erreur de cr<63>ation de socket." << std::endl;
 	}
 
 	m_world.SetSeed(seed);
@@ -77,8 +290,13 @@ void Engine::LoadResource() {
 	LoadTexture(m_skybox.GetTexture(), TEXTURE_PATH "skybox.png", true);
 	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_textureGun, TEXTURE_PATH "gun01.png", true);
 
+	LoadTexture(MenuTitleTexture, MENU_ITEM_PATH "test.png");
+	LoadTexture(MenuBGTexture, MENU_ITEM_PATH "test.png");
+	LoadTexture(MenuQuitTexture, MENU_ITEM_PATH "BasicQuit.png");
+	LoadTexture(MenuOptionsTexture, MENU_ITEM_PATH "test.png");
+	LoadTexture(MenuStartTexture, MENU_ITEM_PATH "BasicPlay.png");
 	TextureAtlas::TextureIndex texDirtIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "metal3.png");
 	TextureAtlas::TextureIndex texIceIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "metal2.png");
 	TextureAtlas::TextureIndex texGrassIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "grass.png");
@@ -113,6 +331,89 @@ 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() {
+	m_textureFont.Bind();
+	float scale = GetScale();
+	unsigned int xOffset = Width() - Width() * 0.26;
+	unsigned int yOffset = Height() - (Height() / 2.2);
+
+	// Iterate through the notifications and display them
+	for (auto it = notifications.begin(); it != notifications.end(); ) {
+		float timeSinceDisplay = m_time - it->displayStartTime;
+
+		// Display the notification message with vertical offset
+		unsigned int y = yOffset - (static_cast<unsigned int>(scale * 20) * (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, scale, 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();
+		// Check if it's time to remove the notification (display for 2 seconds)
+		if (timeSinceDisplay >= 4.0f) {
+			it = notifications.erase(it);  // Remove the notification
+		}
+		else {
+			++it;
+		}
+	}
+	
+}
+
+
+
 void Engine::DisplayCrosshair() {
 	m_textureCrosshair.Bind();
 	static const int crossSize = 32;
@@ -133,6 +434,7 @@ void Engine::DisplayCrosshair() {
 void Engine::DisplayCurrentItem() {
 }
 
+
 void Engine::DisplayHud(int timer) {
 	glBindTexture(GL_TEXTURE_2D, 0);
 	glLoadIdentity();
@@ -146,7 +448,7 @@ void Engine::DisplayHud(int timer) {
 	float playerHp = m_player.GetHP();
 	float facteurOmbrage = m_displayInfo ? 0.5f : 1.0f;
 
-	// Arri<72>re-plan (Barre HP)
+	// Arri<72>re-plan (Barre HP)
 	glColor3f(1.0f * facteurOmbrage, 1.0f * facteurOmbrage, 1.0f * facteurOmbrage);
 	glBegin(GL_QUADS);
 		glVertex2f(fPosX, fPosY - fBarHeight);				// Bas-Gauche
@@ -155,7 +457,7 @@ void Engine::DisplayHud(int timer) {
 		glVertex2f(fPosX, fPosY);							// Haut-Gauche
 	glEnd();
 
-	//TODO: Associer avec m<>chanique de vie du joueur
+	//TODO: Associer avec m<>chanique de vie du joueur
 
 	// Barre HP
 	glColor3f(0.0f * facteurOmbrage, 1.0f * facteurOmbrage, 0.0f * facteurOmbrage);
@@ -166,7 +468,7 @@ void Engine::DisplayHud(int timer) {
 		glVertex2f(fPosX, fPosY);										// Haut-Gauche
 	glEnd();
 
-	// Barre <20>quip
+	// 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);
@@ -187,7 +489,7 @@ void Engine::DisplayHud(int timer) {
 	glTexCoord2f(1, 1); glVertex2i(0, itemHeight);
 	glEnd();
 
-	glDisable(GL_BLEND);
+	//glDisable(GL_BLEND);
 
 	// Username
 	glEnable(GL_BLEND);
@@ -224,7 +526,7 @@ void Engine::DisplayInfo(float elapsedTime, BlockType bloc) {
 	ss << " To-Be-Deleted Chunks : " << m_world.GettbDeleted();
 	PrintText(x, Height() - (Height() / 10.7), scale, ss.str());
 	ss.str("");
-	ss << " Velocity  : " << m_player.GetVelocity(); // IMPORTANT : on utilise l <20> operateur << pour afficher la position
+	ss << " Velocity  : " << m_player.GetVelocity(); // IMPORTANT : on utilise l <20> operateur << pour afficher la position
 	PrintText(x, Height() / 48, scale, ss.str());
 	ss.str("");
 	ss << " Direction : " << m_player.GetDirection();
@@ -249,6 +551,7 @@ void Engine::DrawHud(float elapsedTime, BlockType bloc) {
 
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE);
 	glBlendEquation(GL_FUNC_ADD);
+	glEnable(GL_BLEND);
 
 	glMatrixMode(GL_PROJECTION);
 	glPushMatrix();
@@ -261,6 +564,17 @@ void Engine::DrawHud(float elapsedTime, BlockType bloc) {
 
 	int timer = GetCountdown(elapsedTime);
 
+	// Appel de la fonction pour l'affichage de notifications
+	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);
 	}
@@ -329,111 +643,125 @@ int Engine::GetCountdown(float elapsedTime) {
 }
 
 void Engine::Render(float elapsedTime) {
-	//static float gameTime = elapsedTime;
-	static irrklang::ISound* step; // Pour les sons de pas.
-	static float pollTime = 0;
-	static float bulletTime = 0;
-	static BlockType bloc = 1;
-
-	if (elapsedTime > 0.1f) return;
-
-	//gameTime += elapsedTime;
-	pollTime += elapsedTime;
-
-	Transformation all;
-	Transformation skybox;
-	Vector3f vstep;
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
-	// Transformations initiales
+	if (m_gamestate == GameState::PLAY)
-	glMatrixMode(GL_MODELVIEW);
+	{
-	glLoadIdentity();
+		HideCursor();
+		CenterMouse(); //D<>placement de centermouse dans l'action de jouer
 
-	if (bulletTime > 0.f) bulletTime -= elapsedTime;
+		//static float gameTime = elapsedTime;
-	if (bulletTime < 0.f) bulletTime = 0.f;
+		static irrklang::ISound* step; // Pour les sons de pas.
+		static float pollTime = 0;
+		static float bulletTime = 0;
+		static BlockType bloc = 1;
 
-	static bool leftright = false;
+		if (elapsedTime > 0.1f) return;
-	if (pollTime >= .005f) {
+
-		Player::Sound snd = m_player.ApplyPhysics(m_player.GetInput(m_keyW, m_keyS, m_keyA, m_keyD, m_keySpace, (bloc == BTYPE_LAST && bulletTime <= 0.f && m_mouseL), elapsedTime), &m_world, elapsedTime);
+		//gameTime += elapsedTime;
-		switch (snd) {
+		pollTime += elapsedTime;
-		case Player::Sound::STEP:
+
-			if (leftright)
+		Transformation all;
-				vstep = Vector3f(m_player.GetPosition().x + m_player.GetDirection().z, m_player.GetPosition().y - 1.7f, m_player.GetPosition().z + m_player.GetDirection().x);
+		Transformation skybox;
-			else vstep = Vector3f(m_player.GetPosition().x - m_player.GetDirection().z, m_player.GetPosition().y - 1.7f, m_player.GetPosition().z - m_player.GetDirection().x);
+		Vector3f vstep;
-			m_audio.Create3DAudioObj(step, AUDIO_PATH "step.wav", vstep, m_player.GetVelocity(), .8f);
+
-			leftright = !leftright;
+		// Transformations initiales
-			break;
+		glMatrixMode(GL_MODELVIEW);
-		case Player::Sound::FALL:
+		glLoadIdentity();
-			m_audio.Create3DAudioObj(step, AUDIO_PATH "hit.wav", m_player.GetPosition(), m_player.GetVelocity(), 1.f);
+
-			break;
+		if (bulletTime > 0.f) bulletTime -= elapsedTime;
-		default: break;
+		if (bulletTime < 0.f) bulletTime = 0.f;
+
+		static bool leftright = false;
+		if (pollTime >= .005f) {
+			Player::Sound snd = m_player.ApplyPhysics(m_player.GetInput(m_keyW, m_keyS, m_keyA, m_keyD, m_keySpace, (bloc == BTYPE_LAST && bulletTime <= 0.f && m_mouseL), elapsedTime), &m_world, elapsedTime);
+			switch (snd) {
+			case Player::Sound::STEP:
+				if (leftright)
+					vstep = Vector3f(m_player.GetPosition().x + m_player.GetDirection().z, m_player.GetPosition().y - 1.7f, m_player.GetPosition().z + m_player.GetDirection().x);
+				else vstep = Vector3f(m_player.GetPosition().x - m_player.GetDirection().z, m_player.GetPosition().y - 1.7f, m_player.GetPosition().z - m_player.GetDirection().x);
+				m_audio.Create3DAudioObj(step, AUDIO_PATH "step.wav", vstep, m_player.GetVelocity(), .8f);
+				leftright = !leftright;
+				break;
+			case Player::Sound::FALL:
+				m_audio.Create3DAudioObj(step, AUDIO_PATH "hit.wav", m_player.GetPosition(), m_player.GetVelocity(), 1.f);
+				break;
+			default: break;
+			}
+			m_audio.Update3DAudio(m_player.GetPOV(), m_player.GetDirection(), m_player.GetVelocity()); // Ajustement du positionnement 3D avec les coordonn<6E>es du joueur et
+			// son vecteur de v<>locit<69> (pour l'effet Doppler)
+			pollTime = 0;
 		}
-		m_audio.Update3DAudio(m_player.GetPOV(), m_player.GetDirection(), m_player.GetVelocity()); // Ajustement du positionnement 3D avec les coordonn<6E>es du joueur et
-		// son vecteur de v<>locit<69> (pour l'effet Doppler)
-		pollTime = 0;
-	}
 
-	m_player.ApplyTransformation(all);
+		m_player.ApplyTransformation(all);
 
-	m_player.ApplyTransformation(skybox, false); // Version d'ApplyTransformation qui ne tient compte que de la rotation 
+		m_player.ApplyTransformation(skybox, false); // Version d'ApplyTransformation qui ne tient compte que de la rotation 
-	// (donc l'objet ne bouge pas relativement au joueur, ce qui est pratique pour une skybox!).
+		// (donc l'objet ne bouge pas relativement au joueur, ce qui est pratique pour une skybox!).
 
-	if (m_mouseWU) bloc++;
+		if (m_mouseWU) bloc++;
-	else if (m_mouseWD) bloc--;
+		else if (m_mouseWD) bloc--;
-	if (bloc == BTYPE_LAST + 1) bloc = BTYPE_AIR + 1;
+		if (bloc == BTYPE_LAST + 1) bloc = BTYPE_AIR + 1;
-	else if (bloc == BTYPE_AIR) bloc = BTYPE_LAST; // La selection de BTYPE_LAST <20>quipe l'arme.
+		else if (bloc == BTYPE_AIR) bloc = BTYPE_LAST; // La selection de BTYPE_LAST <20>quipe l'arme.
-	m_mouseWU = m_mouseWD = false;
+		m_mouseWU = m_mouseWD = false;
 
-	if (m_mouseL) {
+		if (m_mouseL) {
-		if (bloc != BTYPE_LAST)
+			if (bloc != BTYPE_LAST)
-			m_world.ChangeBlockAtCursor(bloc, m_player.GetPosition(), m_player.GetDirection(), m_block);
+				m_world.ChangeBlockAtCursor(bloc, m_player.GetPosition(), m_player.GetDirection(), m_block);
-		else if (bulletTime <= 0.f) {
+			else if (bulletTime <= 0.f) {
-			for (int x = 0; x < MAX_BULLETS; ++x)  // Ajouter une balle dans l'array (aussi connu sous le nom de "faire pow pow").
+				for (int x = 0; x < MAX_BULLETS; ++x)  // Ajouter une balle dans l'array (aussi connu sous le nom de "faire pow pow").
-				if (!m_bullets[x]) {
+					if (!m_bullets[x]) {
-					m_bullets[x] = new Bullet(m_player.GetPOV() + m_player.GetDirection(), m_player.GetDirection());
+						m_bullets[x] = new Bullet(m_player.GetPOV() + m_player.GetDirection(), m_player.GetDirection());
-					break;
+						break;
+					}
+					else if (x == MAX_BULLETS - 1) { // S'il y a pas d'espace dans l'array, prendre la place de la premi<6D>re balle de l'array.
+						m_bullets[0]->~Bullet();
+						m_bullets[0] = new Bullet(m_player.GetPOV() + m_player.GetDirection(), m_player.GetDirection());
+					}
+				bulletTime = .1f;
+				m_audio.Create3DAudioObj(m_powpow, AUDIO_PATH "windowsaccount.wav", m_player.GetPOV(), m_player.GetDirection() * 10, .5f);
+				if (m_flash) { // Coupe le rendering et affiche un frame blanc, pour simuler un flash.
+					glClearColor(.8f, .8f, .8f, 1.f);
+					glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+					glClearColor(0.f, 0.f, 0.f, 1.f);
+					return;
 				}
-				else if (x == MAX_BULLETS - 1) { // S'il y a pas d'espace dans l'array, prendre la place de la premi<6D>re balle de l'array.
-					m_bullets[0]->~Bullet();
-					m_bullets[0] = new Bullet(m_player.GetPOV() + m_player.GetDirection(), m_player.GetDirection());
-				}
-			bulletTime = .1f;
-			m_audio.Create3DAudioObj(m_powpow, AUDIO_PATH "windowsaccount.wav", m_player.GetPOV(), m_player.GetDirection() * 10, .5f);
-			if (m_flash) { // Coupe le rendering et affiche un frame blanc, pour simuler un flash.
-				glClearColor(.8f, .8f, .8f, 1.f);
-				glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-				glClearColor(0.f, 0.f, 0.f, 1.f);
-				return;
 			}
 		}
+		else if (m_mouseR)
+			m_world.ChangeBlockAtCursor(BTYPE_AIR, m_player.GetPosition(), m_player.GetDirection(), m_block);
+
+		for (int x = 0; x < MAX_BULLETS; ++x) // Array de bullets en jeu.
+			if (m_bullets[x])
+				if (m_bullets[x]->Update(&m_world, elapsedTime)) {
+					m_bullets[x]->~Bullet();
+					m_bullets[x] = nullptr;
+				}
+
+		m_wrenderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
+		m_world.Update(m_bullets, m_player.GetPosition(), m_blockinfo);
+		m_wrenderer.UpdateWorld(&m_world, m_player.GetPosition(), m_blockinfo);
+
+		if (m_isSkybox) m_skybox.Render(skybox);
+
+		ProcessNotificationQueue();
+		DrawHud(elapsedTime, bloc);
+
+		static bool fell = false;
+		if (m_player.GetPosition().y < 1.7f && !fell) {
+			m_audio.Create3DAudioObj(m_scream, AUDIO_PATH "scream.wav", m_player.GetPOV(), m_player.GetVelocity(), 1.f);
+			fell = true;
+		}
+		else if (m_player.GetPosition().y < -20.f) {
+			m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f)); // Respawn si le bonho- joueur tombe en bas du monde.
+			fell = false;
+		}
 	}
-	else if (m_mouseR)
+	else if (m_gamestate == GameState::MAIN_MENU || m_gamestate == GameState::OPTIONS)
-		m_world.ChangeBlockAtCursor(BTYPE_AIR, m_player.GetPosition(), m_player.GetDirection(), m_block);
+	{
-
+		DrawMenu();
-	for (int x = 0; x < MAX_BULLETS; ++x) // Array de bullets en jeu.
-		if (m_bullets[x])
-			if (m_bullets[x]->Update(&m_world, elapsedTime)) {
-				m_bullets[x]->~Bullet();
-				m_bullets[x] = nullptr;
-			}
-
-	m_wrenderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
-	m_world.Update(m_bullets, m_player.GetPosition(), m_blockinfo);
-	m_wrenderer.UpdateWorld(&m_world, m_player.GetPosition(), m_blockinfo);
-
-	if (m_isSkybox) m_skybox.Render(skybox);
-
-	DrawHud(elapsedTime, bloc);
-	
-	static bool fell = false;
-	if (m_player.GetPosition().y < 1.7f && !fell) {
-		m_audio.Create3DAudioObj(m_scream, AUDIO_PATH "scream.wav", m_player.GetPOV(), m_player.GetVelocity(), 1.f);
-		fell = true;
-	}
-	else if (m_player.GetPosition().y < -20.f) {
-		m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f)); // Respawn si le bonho- joueur tombe en bas du monde.
-		fell = false;
 	}
+	else if (m_gamestate == GameState::QUIT)
+		Stop();
 }
 
 void Engine::KeyPressEvent(unsigned char key) {
@@ -459,14 +787,15 @@ void Engine::KeyPressEvent(unsigned char key) {
 		}
 		break;
 	case 36: // ESC - Quitter
-		Stop();
+		m_gamestate = GameState::MAIN_MENU;
+		//Stop();
 		break;
 	case 57: // Space - Sauter
 		if (!m_keySpace) {
 			m_keySpace = true;
 		}
 		break;
-	case 94: // F10 - Plein <20>cran
+	case 94: // F10 - Plein <20>cran
 		IsFullscreen() ? SetFullscreen(false) : SetFullscreen(true);
 		//SetFullscreen(!IsFullscreen());
 		break;
@@ -474,6 +803,13 @@ 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
@@ -522,6 +858,12 @@ 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;
@@ -555,35 +897,47 @@ void Engine::MouseMoveEvent(int x, int y) {
 	m_player.TurnLeftRight(x - (Width() / 2));
 	m_player.TurnTopBottom(y - (Height() / 2));
 
-	// Centrer la souris seulement si elle n'est pas d<>j<EFBFBD> centr<74>e
+	// Centrer la souris seulement si elle n'est pas d<>j<EFBFBD> centr<74>e
-	// Il est n<>cessaire de faire la v<>rification pour <20>viter de tomber
+	// Il est n<>cessaire de faire la v<>rification pour <20>viter de tomber
-	// dans une boucle infinie o<> l'appel <20> CenterMouse g<>n<EFBFBD>re un
+	// dans une boucle infinie o<> l'appel <20> CenterMouse g<>n<EFBFBD>re un
 	// MouseMoveEvent, qui rapelle CenterMouse qui rapelle un autre
 	// MouseMoveEvent, etc
 	if (x == (Width() / 2) && y == (Height() / 2))
 		return;
 
-	CenterMouse();
 }
 
 void Engine::MousePressEvent(const MOUSE_BUTTON& button, int x, int y) {
-	switch (button) {
+	m_mousemx = x;
-	case MOUSE_BUTTON_LEFT:
+	m_mousemy = y;
-		m_mouseL = true;
+
-		break;
+	if (m_gamestate == GameState::PLAY)
-	case MOUSE_BUTTON_RIGHT:
+	{
-		m_mouseR = true;
+		switch (button) {
-		break;
+		case MOUSE_BUTTON_LEFT:
-	case MOUSE_BUTTON_MIDDLE:
+			m_mouseL = true;
-		m_mouseC = true;
+			break;
-		break;
+		case MOUSE_BUTTON_RIGHT:
-	case MOUSE_BUTTON_WHEEL_UP:
+			m_mouseR = true;
-		m_mouseWU = true;
+			break;
-		break;
+		case MOUSE_BUTTON_MIDDLE:
-	case MOUSE_BUTTON_WHEEL_DOWN:
+			m_mouseC = true;
-		m_mouseWD = true;
+			break;
-		break;
+		case MOUSE_BUTTON_WHEEL_UP:
-	case MOUSE_BUTTON_NONE: break;
+			m_mouseWU = true;
+			break;
+		case MOUSE_BUTTON_WHEEL_DOWN:
+			m_mouseWD = true;
+			break;
+		case MOUSE_BUTTON_NONE: break;
+		}
+	}
+	else if (m_gamestate == GameState::MAIN_MENU)
+	{
+		if ((m_mousemx >= 285 && m_mousemx <= 490) && (m_mousemy >= 150 && m_mousemy <= 250))
+			m_gamestate = GameState::PLAY;
+		if ((m_mousemx >= 305 && m_mousemx <= 450) && (m_mousemy >= 300 && m_mousemy <= 400))
+			m_gamestate = GameState::QUIT;
 	}
 }
 

SQCSim2021/engine.h

@@ -24,6 +24,7 @@ class Engine : public OpenglContext {
 public:
     Engine();
     virtual ~Engine();
+    virtual void DrawMenu();
     virtual void Init();
     virtual void DeInit();
     virtual void LoadResource();
@@ -43,6 +44,10 @@ private:
 
     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 DisplayCurrentItem();
     void DisplayHud(int timer);
@@ -70,9 +75,18 @@ private:
     irrklang::ISound* m_scream;
 
     Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f));
-
+    
     Bullet* m_bullets[MAX_BULLETS];
 
+    //Menu
+    enum class GameState { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };
+    GameState m_gamestate = GameState::MAIN_MENU;
+    Texture MenuTitleTexture;
+    Texture MenuBGTexture;
+    Texture MenuStartTexture;
+    Texture MenuQuitTexture;
+    Texture MenuOptionsTexture;
+
     float m_scale;
     float m_time = 0;
 
@@ -89,6 +103,8 @@ private:
     bool m_resetcountdown = false;
     bool m_stopcountdown = false;
     
+    bool m_keyK = false;
+    bool m_keyL = false;
     bool m_keyW = false;
     bool m_keyA = false;
     bool m_keyS = false;
@@ -99,6 +115,11 @@ private:
     bool m_mouseC = false;
     bool m_mouseWU = false;
     bool m_mouseWD = false;
+    //Pour trouver ou est la souris
+    float m_mousemx = 0;
+    float m_mousemy = 0;
+
+    std::string m_messageNotification = "";
 };
 
 #endif // ENGINE_H__

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

@@ -0,0 +1,98 @@
+<!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>