diff options
Diffstat (limited to '')
-rw-r--r-- | include/graphics/Gui.hpp | 7 | ||||
-rw-r--r-- | include/graphics/RenderSection.hpp | 42 | ||||
-rw-r--r-- | include/graphics/Shader.hpp (renamed from src/graphics/Shader.hpp) | 0 | ||||
-rw-r--r-- | include/graphics/Texture.hpp | 14 | ||||
-rw-r--r-- | include/graphics/Widget.hpp (renamed from src/graphics/Widget.hpp) | 0 |
5 files changed, 63 insertions, 0 deletions
diff --git a/include/graphics/Gui.hpp b/include/graphics/Gui.hpp new file mode 100644 index 0000000..641b941 --- /dev/null +++ b/include/graphics/Gui.hpp @@ -0,0 +1,7 @@ +#pragma once + +class Gui { + +public: + int WHY=0; +}; diff --git a/include/graphics/RenderSection.hpp b/include/graphics/RenderSection.hpp new file mode 100644 index 0000000..953d7ea --- /dev/null +++ b/include/graphics/RenderSection.hpp @@ -0,0 +1,42 @@ +#pragma once + +#include <GL/glew.h> +#include <glm/detail/type_mat.hpp> +#include <glm/vec2.hpp> +#include <glm/detail/type_mat4x4.hpp> +#include <glm/gtx/transform.hpp> +#include <easylogging++.h> + +#include <AssetManager.hpp> +#include <world/Section.hpp> +#include <world/World.hpp> + +class RenderState { + GLuint ActiveVao; + GLuint ActiveShader; +public: + void SetActiveVao(GLuint Vao); + void SetActiveShader(GLuint Shader); +}; + +class RenderSection { + Vector sectionPosition; + World *world; + GLuint Vao, VboTextures, VboModels, VboColors; + + static GLuint VboVertices, VboUvs; + static std::map<GLuint, int> refCounterVbo; + static std::map<GLuint, int> refCounterVao; + + size_t numOfFaces; + +public: + RenderSection(World *world, Vector position); + RenderSection(const RenderSection &other); + ~RenderSection(); + + void UpdateState(const std::map<BlockTextureId, glm::vec4> &textureAtlas); + void Render(RenderState &state); + + Section *GetSection(); +};
\ No newline at end of file diff --git a/src/graphics/Shader.hpp b/include/graphics/Shader.hpp index 17a434e..17a434e 100644 --- a/src/graphics/Shader.hpp +++ b/include/graphics/Shader.hpp diff --git a/include/graphics/Texture.hpp b/include/graphics/Texture.hpp new file mode 100644 index 0000000..277806a --- /dev/null +++ b/include/graphics/Texture.hpp @@ -0,0 +1,14 @@ +#pragma once + +#include <SFML/Graphics.hpp> +#include <easylogging++.h> +#include <GL/glew.h> + +class Texture { + Texture(Texture&); + Texture&operator=(Texture&); +public: + GLuint texture; + Texture(std::string filename, GLenum textureWrapping = GL_CLAMP_TO_BORDER, GLenum textureFiltering = GL_NEAREST); + ~Texture(); +};
\ No newline at end of file diff --git a/src/graphics/Widget.hpp b/include/graphics/Widget.hpp index c4d5dc1..c4d5dc1 100644 --- a/src/graphics/Widget.hpp +++ b/include/graphics/Widget.hpp |