diff options
author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-07-29 16:55:16 +0200 |
---|---|---|
committer | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-07-29 16:55:16 +0200 |
commit | f942405184c2d6067fb5303b58a225edf7e452b1 (patch) | |
tree | 83e70c7e3019e5b195c9caf41194b2113fa76d7f /include/graphics | |
parent | 2017-07-26 (diff) | |
download | AltCraft-f942405184c2d6067fb5303b58a225edf7e452b1.tar AltCraft-f942405184c2d6067fb5303b58a225edf7e452b1.tar.gz AltCraft-f942405184c2d6067fb5303b58a225edf7e452b1.tar.bz2 AltCraft-f942405184c2d6067fb5303b58a225edf7e452b1.tar.lz AltCraft-f942405184c2d6067fb5303b58a225edf7e452b1.tar.xz AltCraft-f942405184c2d6067fb5303b58a225edf7e452b1.tar.zst AltCraft-f942405184c2d6067fb5303b58a225edf7e452b1.zip |
Diffstat (limited to 'include/graphics')
-rw-r--r-- | include/graphics/Gui.hpp | 7 | ||||
-rw-r--r-- | include/graphics/RenderSection.hpp | 42 | ||||
-rw-r--r-- | include/graphics/Shader.hpp | 24 | ||||
-rw-r--r-- | include/graphics/Texture.hpp | 14 | ||||
-rw-r--r-- | include/graphics/Widget.hpp | 8 |
5 files changed, 95 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/include/graphics/Shader.hpp b/include/graphics/Shader.hpp new file mode 100644 index 0000000..17a434e --- /dev/null +++ b/include/graphics/Shader.hpp @@ -0,0 +1,24 @@ +#pragma once + +#include <string> +#include <fstream> +#include <sstream> + +#include <easylogging++.h> +#include <GL/glew.h> + +class Shader +{ +private: + const GLchar *vertex; + const GLchar *fragment; +public: + // Идентификатор программы + GLuint Program; + // Конструктор считывает и собирает шейдер + Shader(const GLchar* vertexPath, const GLchar* fragmentPath, const GLchar* geometryPath = nullptr); + // Использование программы + void Use(); + + void Reload(); +};
\ No newline at end of file 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/include/graphics/Widget.hpp b/include/graphics/Widget.hpp new file mode 100644 index 0000000..c4d5dc1 --- /dev/null +++ b/include/graphics/Widget.hpp @@ -0,0 +1,8 @@ +#pragma once + +class Widget { + unsigned int x,y,w,h; +public: + Widget(Widget *parent); + ~Widget(); +}; |