Push sans le menu solo/multi.

SQCSim2021/define.h

@@ -20,13 +20,12 @@
 #define SRV_ADDR "127.0.0.1"
 #define COUNTDOWN 300
 
-#define BASE_WIDTH 640
-#define BASE_HEIGHT 480
+#define BASE_WIDTH 1600
+#define BASE_HEIGHT 900
 
-#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/"
+#define TEXTURE_PATH    "./media/textures/"
+#define SHADER_PATH	    "./media/shaders/"
+#define AUDIO_PATH		"./media/audio/"
+#define CHUNK_PATH		"./media/chunks/"
 
 #endif // DEFINE_H__

SQCSim2021/engine.h

@@ -24,7 +24,6 @@ class Engine : public OpenglContext {
 public:
     Engine();
     virtual ~Engine();
-    virtual void DrawMenu();
     virtual void Init();
     virtual void DeInit();
     virtual void LoadResource();
@@ -37,7 +36,7 @@ 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);
@@ -49,11 +48,13 @@ private:
     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;
@@ -63,10 +64,13 @@ 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");
@@ -78,15 +82,6 @@ private:
     
     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;
 
@@ -101,6 +96,7 @@ 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;
@@ -115,9 +111,6 @@ 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 = "";
 };

SQCSim2021/skybox.cpp

@@ -8,30 +8,30 @@ void Skybox::Init(float size){
 	int count = 0;
 	VertexBuffer::VertexData* vd = new VertexBuffer::VertexData[24];
 
-	vd[count++] = VertexBuffer::VertexData(size, -size, size, 1.f, 1.f, 1.f, 0.f, .5f);
 	vd[count++] = VertexBuffer::VertexData(-size, -size, size, 1.f, 1.f, 1.f, .25f, .5f); 
 	vd[count++] = VertexBuffer::VertexData(-size, size, size, 1.f, 1.f, 1.f, .25f, .75f); 
 	vd[count++] = VertexBuffer::VertexData(size, size, size, 1.f, 1.f, 1.f, 0.f, .75f);   
+	vd[count++] = VertexBuffer::VertexData(size, -size, size, 1.f, 1.f, 1.f, 0.f, .5f);   
 
-	vd[count++] = VertexBuffer::VertexData(-size, -size, size, 1.f, 1.f, 1.f, .25f, .5f);
 	vd[count++] = VertexBuffer::VertexData(-size, -size, -size, 1.f, 1.f, 1.f, .5f, .5f); 
 	vd[count++] = VertexBuffer::VertexData(-size, size, -size, 1.f, 1.f, 1.f, .5f, .75f); 
 	vd[count++] = VertexBuffer::VertexData(-size, size, size, 1.f, 1.f, 1.f, .25f, .75f); 
+	vd[count++] = VertexBuffer::VertexData(-size, -size, size, 1.f, 1.f, 1.f, .25f, .5f); 
 
-	vd[count++] = VertexBuffer::VertexData(-size, -size, -size, 1.f, 1.f, 1.f, .5f, .5f);
 	vd[count++] = VertexBuffer::VertexData(size, -size, -size, 1.f, 1.f, 1.f, .75f, .5f); 
 	vd[count++] = VertexBuffer::VertexData(size, size, -size, 1.f, 1.f, 1.f, .75f, .75f); 
 	vd[count++] = VertexBuffer::VertexData(-size, size, -size, 1.f, 1.f, 1.f, .5f, .75f); 
+	vd[count++] = VertexBuffer::VertexData(-size, -size, -size, 1.f, 1.f, 1.f, .5f, .5f); 
 
-	vd[count++] = VertexBuffer::VertexData(size, -size, -size, 1.f, 1.f, 1.f, .75f, .5f);
 	vd[count++] = VertexBuffer::VertexData(size, -size, size, 1.f, 1.f, 1.f, 1.f, .5f);   
 	vd[count++] = VertexBuffer::VertexData(size, size, size, 1.f, 1.f, 1.f, 1.f, .75f);   
 	vd[count++] = VertexBuffer::VertexData(size, size, -size, 1.f, 1.f, 1.f, .75f, .75f); 
+	vd[count++] = VertexBuffer::VertexData(size, -size, -size, 1.f, 1.f, 1.f, .75f, .5f); 
 
-	vd[count++] = VertexBuffer::VertexData(size, size, -size, 1.f, 1.f, 1.f, .25f, 1.f);
-	vd[count++] = VertexBuffer::VertexData(size, size, size, 1.f, 1.f, 1.f, .5f, 1.f);
-	vd[count++] = VertexBuffer::VertexData(-size, size, size, 1.f, 1.f, 1.f, .5f, .75f);
-	vd[count++] = VertexBuffer::VertexData(-size, size, -size, 1.f, 1.f, 1.f, .25f, .75f);
+	vd[count++] = VertexBuffer::VertexData(size, size, size, 1.f, 1.f, 1.f, .25f, 1.f);  
+	vd[count++] = VertexBuffer::VertexData(-size, size, size, 1.f, 1.f, 1.f, .25f, .75f);
+	vd[count++] = VertexBuffer::VertexData(-size, size, -size, 1.f, 1.f, 1.f, .5f, .75f);
+	vd[count++] = VertexBuffer::VertexData(size, size, -size, 1.f, 1.f, 1.f, .5f, 1.f);  
 
 	vd[count++] = VertexBuffer::VertexData(-size, -size, size, 1.f, 1.f, 1.f, .5f, .25f);
 	vd[count++] = VertexBuffer::VertexData(size, -size, size, 1.f, 1.f, 1.f, .75f, .25f);