From f7decf41d8d0062901cd39c42a3669a80537c7df Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Thu, 3 Aug 2017 20:03:59 +0500
Subject: 2017-08-03

---
 include/graphics/Gui.hpp           |  7 -------
 include/graphics/RenderSection.hpp | 42 --------------------------------------
 include/graphics/Shader.hpp        | 24 ----------------------
 include/graphics/Texture.hpp       | 14 -------------
 include/graphics/Widget.hpp        |  8 --------
 5 files changed, 95 deletions(-)
 delete mode 100644 include/graphics/Gui.hpp
 delete mode 100644 include/graphics/RenderSection.hpp
 delete mode 100644 include/graphics/Shader.hpp
 delete mode 100644 include/graphics/Texture.hpp
 delete mode 100644 include/graphics/Widget.hpp

(limited to 'include/graphics')

diff --git a/include/graphics/Gui.hpp b/include/graphics/Gui.hpp
deleted file mode 100644
index 641b941..0000000
--- a/include/graphics/Gui.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-class Gui {
-
-public:
-    int WHY=0;
-};
diff --git a/include/graphics/RenderSection.hpp b/include/graphics/RenderSection.hpp
deleted file mode 100644
index 953d7ea..0000000
--- a/include/graphics/RenderSection.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#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
deleted file mode 100644
index 17a434e..0000000
--- a/include/graphics/Shader.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#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
deleted file mode 100644
index 277806a..0000000
--- a/include/graphics/Texture.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#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
deleted file mode 100644
index c4d5dc1..0000000
--- a/include/graphics/Widget.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-class Widget {
-    unsigned int x,y,w,h;
-public:
-    Widget(Widget *parent);
-    ~Widget();
-};
-- 
cgit v1.2.3