Merge branch 'SQC_17_HUD'

Créé branche_L_C

SQCSim-common/bullet.cpp

@@ -7,8 +7,9 @@ Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t tid): m_startpos(pos), m_cur
 
 Bullet::~Bullet() {}
 
-bool Bullet::Update(World* world, float elapsedtime) {
-	for (int x = 0; x < 1000; ++x) {
+bool Bullet::Update(World* world, float elapsedtime, int perframe) {
+	int max = 100 / perframe;
+	for (int x = 0; x < max; ++x) {
 		m_currentpos += m_velocity * elapsedtime;
 
 		if (!world->ChunkAt(m_currentpos))
@@ -30,10 +31,14 @@ void Bullet::Transpose(int& x, int& z) {
 	m_startpos.z -= z * CHUNK_SIZE_Z;
 }
 
-Vector3f Bullet::getPos() {
+Vector3f Bullet::getPos() const {
 	return m_currentpos;
 }
 
+Vector3f Bullet::getVel() const {
+	return m_velocity;
+}
+
 uint64_t Bullet::getTeamID(){
 	return m_tid;
 }

SQCSim-common/bullet.h

@@ -12,9 +12,10 @@ public:
 	Bullet(Vector3f pos, Vector3f dir, uint64_t tid);
 	~Bullet();
 
-	bool Update(World* world, float elapsedtime);
+	bool Update(World* world, float elapsedtime, int perframe);
 	void Transpose(int& x, int& z);
-	Vector3f getPos();
+	Vector3f getPos() const;
+	Vector3f getVel() const;
 	uint64_t getTeamID();
 
 private:

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.

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) {

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>
-    <LibraryPath>external\glew210\lib;external\sfml251\lib;external\devil178\lib;external\irrKlang-1.6.0\lib\Win32-visualStudio;$(LibraryPath)</LibraryPath>
+    <IncludePath>external\irrKlang-1.6.0\include;external\glew210\include;external\devil180\include;external\sfml251-32\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>
   </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>
-    <LibraryPath>external\sfml251\lib;external\devil180\lib\x86\Release;external\glew210\lib\Release\Win32;$(LibraryPath);external\irrKlang-1.6.0\lib\Win32-visualStudio</LibraryPath>
+    <IncludePath>external\devil180\include;external\irrKlang-1.6.0\include;external\sfml251-32\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>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>

SQCSim2021/audio.cpp

@@ -2,17 +2,17 @@
 
 Audio::Audio() {
 	m_engine = irrklang::createIrrKlangDevice();
-	m_engine->setDopplerEffectParameters(1);
-	m_engine->setRolloffFactor(1);
-	m_engine->setDefault3DSoundMinDistance(1);
+	m_engine->setDopplerEffectParameters(10);
+	m_engine->setRolloffFactor(2);
+	m_engine->setDefault3DSoundMinDistance(.1);
 	m_engine->setDefault3DSoundMaxDistance(1000);
 }
 
 Audio::Audio(const char * music) {
 	m_engine = irrklang::createIrrKlangDevice();
 	m_engine->setDopplerEffectParameters(1);
-	m_engine->setRolloffFactor(1);
-	m_engine->setDefault3DSoundMinDistance(1);
+	m_engine->setRolloffFactor(2);
+	m_engine->setDefault3DSoundMinDistance(.1);
 	m_engine->setDefault3DSoundMaxDistance(1000);
 	m_music = m_engine->play2D(music, false, true, true, irrklang::ESM_STREAMING);
 }
@@ -28,10 +28,11 @@ void Audio::Update3DAudio(Vector3f pos, Vector3f dir, Vector3f vel) {
 								  irrklang::vec3df(vel.x, vel.y, vel.z));
 }
 
-void Audio::Create3DAudioObj(irrklang::ISound* sound, const char* name, Vector3f pos, Vector3f vel, float volume = 1) {
-	sound = m_engine->play3D(name, irrklang::vec3df(pos.x, pos.y, pos.z), false, false, true, irrklang::ESM_NO_STREAMING, true);
+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->setVelocity(irrklang::vec3df(vel.x, vel.y, vel.z));
 	sound->setVolume(volume);
+	return sound;
 }
 
 void Audio::Render3DAudioObj(irrklang::ISound* sound, Vector3f& pos, Vector3f& vel, float volume = 1) {

SQCSim2021/audio.h

@@ -14,17 +14,17 @@
 
 class Audio {
 private:
-	irrklang::ISoundEngine* m_engine;
 	irrklang::ISound* m_music;
 
 public:
 	Audio();
 	Audio(const char* music);
 	~Audio();
+	irrklang::ISoundEngine* m_engine;
 
 	void Update3DAudio(Vector3f pos, Vector3f dir, Vector3f speed);
 
-	void Create3DAudioObj(irrklang::ISound* sound, const char* name, Vector3f pos, Vector3f vel, float volume);
+	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);
 

SQCSim2021/define.h

@@ -1,6 +1,8 @@
 #ifndef CLI_DEFINE_H__
 #define CLI_DEFINE_H__
 
+//#define SFML_STATIC true
+
 #include <iostream>
 #include <chrono>
 #include <iomanip>
@@ -22,12 +24,16 @@
 #define SRV_ADDR "127.0.0.1"
 #define COUNTDOWN 300
 
+#define BULLET_UPDATES_PER_FRAME 20
+
 #define BASE_WIDTH 640
 #define BASE_HEIGHT 480
 
+
 #define TEXTURE_PATH        "./media/textures/"
 #define SHADER_PATH		    "./media/shaders/"
 #define AUDIO_PATH			"./media/audio/"
 #define CHUNK_PATH			"./media/chunks/"
+#define MENU_ITEM_PATH		"./media/menu_items/"
 
 #endif // DEFINE_H__

SQCSim2021/engine.h

@@ -24,6 +24,8 @@ class Engine : public OpenglContext {
 public:
     Engine();
     virtual ~Engine();
+    virtual void DrawMenu();
+    virtual void DrawSplachScreen();
     virtual void Init();
     virtual void DeInit();
     virtual void LoadResource();
@@ -36,19 +38,25 @@ public:
     virtual void MouseReleaseEvent(const MOUSE_BUTTON &button, int x, int y);
 
 private:
-    float GetScale() const;
+    std::pair<float, 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, float scale, const std::string& t);
+    void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
 
     Connector m_conn;
     Shader m_shader01;
@@ -58,23 +66,40 @@ private:
     World m_world = World();
     WorldRenderer m_wrenderer = WorldRenderer();
 
-    Texture m_textureSkybox;
-    Texture m_textureFont;
     Texture m_textureCrosshair;
+    Texture m_textureFont;
     Texture m_textureGun;
+    Texture m_texturePovGun;
+    Texture m_textureSkybox;
+    Texture m_textureSoloMultiMenu;
+    Texture m_textureTitle;
 
     Skybox m_skybox;
     Audio m_audio = Audio(AUDIO_PATH "start.wav");
 
-    irrklang::ISound* m_powpow;
-    irrklang::ISound* m_scream;
+    irrklang::ISound* m_powpow,
+        * m_scream;
+    irrklang::ISound *m_whoosh[MAX_BULLETS];
 
     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;
+    Texture SplachScreenTexture;
+
     float m_scale;
     float m_time = 0;
+    float m_time_SplashScreen = 0;
+    float m_Width = 0;
+    float m_Height = 0;
 
     int m_renderCount = 0;
     int m_countdown = COUNTDOWN;
@@ -87,8 +112,11 @@ 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;
@@ -99,6 +127,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>