diff options
Diffstat (limited to 'src/libjin')
-rw-r--r-- | src/libjin/graphics/je_graphic.cpp | 26 | ||||
-rw-r--r-- | src/libjin/graphics/je_graphic.h | 2 | ||||
-rw-r--r-- | src/libjin/graphics/je_renderable.h | 4 |
3 files changed, 2 insertions, 30 deletions
diff --git a/src/libjin/graphics/je_graphic.cpp b/src/libjin/graphics/je_graphic.cpp index a01526e..6cd05a1 100644 --- a/src/libjin/graphics/je_graphic.cpp +++ b/src/libjin/graphics/je_graphic.cpp @@ -137,32 +137,6 @@ namespace JinEngine // glTexParameteri(GL_) //} - Shaders::Shader* Graphic::getDefaultShader() - { - const char* default_shader = R"( - #VERTEX_SHADER - - Vertex vert(Vertex v) - { - return v; - } - - #END_VERTEX_SHADER - - #FRAGMENT_SHADER - - Color frag(Color col, Texture tex, Vertex v) - { - return col * texel(tex, v.uv); - } - - #END_FRAGMENT_SHADER - )"; - static Shader* shader = Shader::createShader(default_shader); - if(shader != nullptr) - return shader; - } - } // namespace Graphics } // namespace JinEngine diff --git a/src/libjin/graphics/je_graphic.h b/src/libjin/graphics/je_graphic.h index 53eacee..90b5522 100644 --- a/src/libjin/graphics/je_graphic.h +++ b/src/libjin/graphics/je_graphic.h @@ -85,8 +85,6 @@ namespace JinEngine Math::Vector2<uint> mSize; private: - static Shaders::Shader* getDefaultShader(); - GLuint mTexture; }; diff --git a/src/libjin/graphics/je_renderable.h b/src/libjin/graphics/je_renderable.h index 0e29556..ca9888e 100644 --- a/src/libjin/graphics/je_renderable.h +++ b/src/libjin/graphics/je_renderable.h @@ -24,14 +24,14 @@ namespace JinEngine class Renderable { public: - void setShader(const Shaders::Shader* shader); + //void setShader(const Shaders::Shader* shader); virtual void render(float x, float y, float sx, float sy, float r) const {}; virtual void render(float x, float y, float sx, float sy, float r, float ox, float oy) const {}; virtual void render(float x, float y, float sx, float sy, float r, Origin origin) const {}; protected: - const Shaders::Shader* mShader; + //const Shaders::Shader* mShader; }; |