Skip to content

Commit 1ea71bb

Browse files
committed
Cleanup shader includes example
1 parent ddb22c2 commit 1ea71bb

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

source/examples/shaderincludes/main.cpp

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1+
#include <glowbase/File.h>
12

23
#include <glow/NamedString.h>
34
#include <glow/Shader.h>
45
#include <glow/debugmessageoutput.h>
5-
#include <glow/logging.h>
66

7-
#include <glowbase/File.h>
8-
#include <glowbase/File.h>
97
#include <glowutils/ScreenAlignedQuad.h>
108
#include <glowutils/glowutils.h>
119
#include <glowutils/StringTemplate.h>
@@ -31,8 +29,6 @@ class EventHandler : public ExampleWindowEventHandler
3129
{
3230
}
3331

34-
void createAndSetupShaders();
35-
3632
virtual void initialize(Window & window) override
3733
{
3834
ExampleWindowEventHandler::initialize(window);
@@ -41,15 +37,15 @@ class EventHandler : public ExampleWindowEventHandler
4137

4238
gl::glClearColor(0.2f, 0.3f, 0.4f, 1.f);
4339

44-
4540
glow::NamedString::create("/shaderincludes/color.glsl", new glow::File("data/shaderincludes/color.glsl"));
4641

47-
glowutils::StringTemplate* fragmentShaderString = new glowutils::StringTemplate(new glow::File("data/shaderincludes/test.frag"));
42+
glowutils::StringTemplate* fragmentShaderString = new glowutils::StringTemplate(new glow::File("data/shaderincludes/test.frag"));
43+
4844
#ifdef MAC_OS
49-
fragmentShaderString->replace("#version 140", "#version 150");
45+
fragmentShaderString->replace("#version 140", "#version 150");
5046
#endif
5147

52-
m_quad = new glowutils::ScreenAlignedQuad(new glow::Shader(gl::GL_FRAGMENT_SHADER, fragmentShaderString));
48+
m_quad = new glowutils::ScreenAlignedQuad(new glow::Shader(gl::GL_FRAGMENT_SHADER, fragmentShaderString));
5349
}
5450

5551
virtual void framebufferResizeEvent(ResizeEvent & event) override
@@ -59,14 +55,12 @@ class EventHandler : public ExampleWindowEventHandler
5955
int side = std::min<int>(width, height);
6056

6157
gl::glViewport((width - side) / 2, (height - side) / 2, side, side);
62-
6358
}
6459

6560
virtual void paintEvent(PaintEvent &) override
6661
{
6762
gl::glClear(gl::GL_COLOR_BUFFER_BIT | gl::GL_DEPTH_BUFFER_BIT);
6863

69-
7064
m_quad->draw();
7165
}
7266

0 commit comments

Comments
 (0)