From 28c839e0b86cc875802ad79b2228133dfbde4b55 Mon Sep 17 00:00:00 2001 From: Ben Date: Mon, 17 Sep 2018 16:13:13 +0100 Subject: [PATCH] what --- OpenGL/main.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/OpenGL/main.cpp b/OpenGL/main.cpp index dbad6f0..122efa3 100644 --- a/OpenGL/main.cpp +++ b/OpenGL/main.cpp @@ -32,10 +32,20 @@ int main(int argc, char** argv) { 1, 2, 3 // second triangle }; + enum class ShaderMode { + SHADER_TEXURE, + SHADER_COLOUR, + SHADER_GRADIENT, + SHADER_TEXGRADIENT + }; + + ShaderMode Mode; + Mesh mesh(vertices, indices, sizeof(vertices) / sizeof(vertices[0])); - Shader shader("C:/Users/Ben/Desktop/crumpet-engine/resources/shaders/simple2d"); Texture chanceCube("C:/Users/Ben/Desktop/crumpet-engine/resources/textures/chance-cube.jpg"); + Shader shader("C:/Users/Ben/Desktop/crumpet-engine/resources/shaders/simple2d"); + while(!display.isClosed()) { glClear(GL_COLOR_BUFFER_BIT); @@ -46,5 +56,6 @@ int main(int argc, char** argv) { display.Update(); } + display.~Display(); return 0; }