Merge branch 'sqc-14_classe_remoteplayer' into SQC-15_paquets

This commit is contained in:
MarcEricMartel
2023-10-27 13:59:26 -04:00
13 changed files with 184 additions and 44 deletions

View File

@@ -18,7 +18,7 @@
#include "audio.h"
#include "textureatlas.h"
#include "connector.h"
#include "worldrenderer.h"
#include "renderer.h"
class Engine : public OpenglContext {
public:
@@ -61,7 +61,7 @@ private:
TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);
World m_world = World();
WorldRenderer m_wrenderer = WorldRenderer();
Renderer m_renderer = Renderer();
Texture m_textureSkybox;
Texture m_textureFont;