diff options
| author | clyne <clyne@bitgloo.com> | 2019-09-25 14:35:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 14:35:10 -0400 |
| commit | 5de39474dd9c17cc7f09015f291769fbe3fd5931 (patch) | |
| tree | 73de6ae8aad4418cd19d55d5b468a20b404446ec /src/render.hpp | |
| parent | ec0ab456cf869f2daa6dea41158c54da745626d8 (diff) | |
| parent | 1703f84121f18277c2a9bd671e204730c131c102 (diff) | |
Merge pull request #2 from tcsullivan/font-support
Font support
Diffstat (limited to 'src/render.hpp')
| -rw-r--r-- | src/render.hpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/render.hpp b/src/render.hpp index f3064d1..88668cc 100644 --- a/src/render.hpp +++ b/src/render.hpp @@ -36,9 +36,21 @@ #include "shader.hpp" #include "world.hpp" +#include "components/Player.hpp" +#include "events/render.hpp" #include "events/world.hpp" -#include "components/Player.hpp" +#include <map> + +struct UIRenderData +{ + GLuint tex; + GLuint normal; + unsigned int vertex; + + UIRenderData(GLuint _tex, GLuint _normal, unsigned int _vertex) : + tex(_tex), normal(_normal), vertex(_vertex) {} +}; class RenderSystem : public entityx::System<RenderSystem>, public entityx::Receiver<RenderSystem> @@ -52,8 +64,12 @@ private: SDL_GLContext context; Shader worldShader; + Shader uiShader; glm::vec3 camPos; + // Map of VBOs and their render data + std::map<GLuint, UIRenderData> uiRenders; + GLuint worldVBO = 0; unsigned int worldVertex = 0; GLuint worldTexture = 0; @@ -92,8 +108,8 @@ public: * EVENTS * ************/ void receive(const WorldMeshUpdateEvent &wmu); + void receive(const NewRenderEvent &nre); void receive(const entityx::ComponentAddedEvent<Player> &cae); - }; #endif // SYSTEM_RENDER_HPP_ |