Merge branch 'master' into SQC-31

SQCSim2021/engine.h

@@ -2,9 +2,12 @@
 #define ENGINE_H__
 
 #include <algorithm>
+#include <chrono>
 #include <cmath>
+#include <unordered_map>
 #include "../SQCSim-common/array2d.h"
 #include "../SQCSim-common/blockinfo.h"
+#include "../SQCSim-common/boostinfo.h"
 #include "../SQCSim-common/bullet.h"
 #include "../SQCSim-common/chunk.h"
 #include "../SQCSim-common/world.h"
@@ -20,6 +23,8 @@
 #include "connector.h"
 #include "renderer.h"
 #include "remoteplayer.h"
+#include "booster.h"
+
 
 class Engine : public OpenglContext {
 public:
@@ -59,13 +64,20 @@ private:
     void DrawHud(float elapsedTime, BlockType bloc);
     void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
 
+
+    
+
+
     Connector m_conn;
     Shader m_shader01;
     BlockInfo* m_blockinfo[BTYPE_LAST];
+    BoostInfo* m_boostinfo[BTYPE_BOOST_LAST];
     TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);
+    TextureAtlas m_animeAtlas = TextureAtlas(TYPE_LAST + POS_LAST);
 
     World m_world = World();
     Renderer m_renderer = Renderer();
+    Booster m_booster = Booster();
 
     Texture m_textureCrosshair;
     Texture m_textureFont;
@@ -77,6 +89,8 @@ private:
     Texture m_textureMultiText;
     Texture m_textureTitle;
 
+    TextureAtlas::TextureIndex texBoostHeal;
+
     Skybox m_skybox;
     Audio m_audio = Audio(AUDIO_PATH "start.wav");
 
@@ -88,10 +102,13 @@ private:
     
     Bullet* m_bullets[MAX_BULLETS];
 
-    std::map<uint64_t, Player*> m_players;
+    std::unordered_map<uint64_t, Player*> m_players;
+    netprot::Buffer m_buf, m_bufout;
+    std::chrono::high_resolution_clock::time_point m_startTime;
 
     //Menu
     enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY,SINGLEMULTI };
+
     GameState m_gamestate = GameState::MAIN_MENU;
     Texture MenuTitleTexture;
     Texture MenuBGTexture;
@@ -99,11 +116,13 @@ private:
     Texture MenuStartTexture;
     Texture MenuQuitTexture;
     Texture MenuOptionsTexture;
+    Texture PauseBGTexture;
     Texture SplachScreenTexture;
     Texture MusicTexture; //TODO
     Texture OnOffBtnTexture;//TODO
     Texture BackBtnTexture;//TODO
 
+
     float m_scale;
     float m_time = 0;
     float m_time_SplashScreen = 0;
@@ -114,6 +133,8 @@ private:
 
     int m_renderCount = 0;
     int m_countdown = COUNTDOWN;
+    int m_nbReductionChunk = 4;
+    int m_timerReductionChunk = 30;
 
     bool m_damage = false;
 
@@ -123,11 +144,14 @@ private:
     bool m_flash = true;
     bool m_displayCrosshair = true;
     bool m_displayHud = true;
-    bool m_displayInfo = false;
+    bool m_displayInfo = true;
     bool m_resetcountdown = false;
     bool m_soloMultiChoiceMade = false;
     bool m_stopcountdown = false;
     
+    bool m_key1 = false;
+    bool m_key2 = false;
+
     bool m_keyK = false;
     bool m_keyL = false;
     bool m_keyW = false;
@@ -145,7 +169,8 @@ private:
     float m_mousemy = 0;
 
     bool m_networkgame = false;
-
+    netprot::PlayerInfo m_pinfo;
+    RemotePlayer m_remotePlayer = RemotePlayer(netprot::PlayerInfo(),Vector3f(5.5f, CHUNK_SIZE_Y + 1.8f, 5.5f));
     std::string m_messageNotification = "";
 };