1
+ #include < glowbase/File.h>
1
2
2
3
#include < glow/NamedString.h>
3
4
#include < glow/Shader.h>
4
5
#include < glow/debugmessageoutput.h>
5
- #include < glow/logging.h>
6
6
7
- #include < glowbase/File.h>
8
- #include < glowbase/File.h>
9
7
#include < glowutils/ScreenAlignedQuad.h>
10
8
#include < glowutils/glowutils.h>
11
9
#include < glowutils/StringTemplate.h>
@@ -31,8 +29,6 @@ class EventHandler : public ExampleWindowEventHandler
31
29
{
32
30
}
33
31
34
- void createAndSetupShaders ();
35
-
36
32
virtual void initialize (Window & window) override
37
33
{
38
34
ExampleWindowEventHandler::initialize (window);
@@ -41,15 +37,15 @@ class EventHandler : public ExampleWindowEventHandler
41
37
42
38
gl::glClearColor (0 .2f , 0 .3f , 0 .4f , 1 .f );
43
39
44
-
45
40
glow::NamedString::create (" /shaderincludes/color.glsl" , new glow::File (" data/shaderincludes/color.glsl" ));
46
41
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
+
48
44
#ifdef MAC_OS
49
- fragmentShaderString->replace (" #version 140" , " #version 150" );
45
+ fragmentShaderString->replace (" #version 140" , " #version 150" );
50
46
#endif
51
47
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));
53
49
}
54
50
55
51
virtual void framebufferResizeEvent (ResizeEvent & event) override
@@ -59,14 +55,12 @@ class EventHandler : public ExampleWindowEventHandler
59
55
int side = std::min<int >(width, height);
60
56
61
57
gl::glViewport ((width - side) / 2 , (height - side) / 2 , side, side);
62
-
63
58
}
64
59
65
60
virtual void paintEvent (PaintEvent &) override
66
61
{
67
62
gl::glClear (gl::GL_COLOR_BUFFER_BIT | gl::GL_DEPTH_BUFFER_BIT);
68
63
69
-
70
64
m_quad->draw ();
71
65
}
72
66
0 commit comments