Merge branch 'master' into affichage_des_messages

SQCSim2021/engine.h

@@ -1,20 +1,24 @@
 #ifndef ENGINE_H__
 #define ENGINE_H__
 
+#include <algorithm>
+#include <cmath>
+#include "../SQCSim-common/array2d.h"
+#include "../SQCSim-common/blockinfo.h"
+#include "../SQCSim-common/bullet.h"
+#include "../SQCSim-common/chunk.h"
+#include "../SQCSim-common/world.h"
+#include "../SQCSim-common/transformation.h"
+#include "../SQCSim-common/player.h"
 #include "define.h"
 #include "openglcontext.h"
 #include "texture.h"
-#include "transformation.h"
 #include "shader.h"
-#include "player.h"
-#include "chunk.h"
 #include "skybox.h"
 #include "audio.h"
 #include "textureatlas.h"
-#include "blockinfo.h"
-#include "array2d.h"
-#include "world.h"
-#include "bullet.h"
+#include "connector.h"
+#include "worldrenderer.h"
 
 class Engine : public OpenglContext {
 public:
@@ -50,11 +54,13 @@ private:
     void DrawHud(float elapsedTime, BlockType bloc);
     void PrintText(float x, float y, float scale, const std::string& t);
 
+    Connector m_conn;
     Shader m_shader01;
     BlockInfo* m_blockinfo[BTYPE_LAST];
     TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);
 
     World m_world = World();
+    WorldRenderer m_wrenderer = WorldRenderer();
 
     Texture m_textureSkybox;
     Texture m_textureFont;