From f7791709745e6c8b82ff95629f597493aff6613a Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Fri, 17 Nov 2017 23:44:00 +0000 Subject: more tests added --- yage/core/texture.h | 2 +- yage/core/vertex.h | 2 +- yage/core/window.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'yage/core') diff --git a/yage/core/texture.h b/yage/core/texture.h index 6f61afd3..85f74647 100644 --- a/yage/core/texture.h +++ b/yage/core/texture.h @@ -19,7 +19,7 @@ struct Texture { int width; int height; - Texture() = default; + Texture() : id(0), width(0), height(0) {} Texture(GLuint id_i, int width_i, int height_i) : id(id_i), width(width_i), height(height_i) diff --git a/yage/core/vertex.h b/yage/core/vertex.h index da3c2bfa..f81b4f42 100644 --- a/yage/core/vertex.h +++ b/yage/core/vertex.h @@ -29,7 +29,7 @@ struct Colour { GLubyte b; GLubyte a; - Colour() = default; + Colour() : r(0), g(0), b(0), a(0) {} Colour(GLubyte r_, GLubyte g_, GLubyte b_, GLubyte a_) : r(r_), g(g_), b(b_), a(a_) diff --git a/yage/core/window.cpp b/yage/core/window.cpp index f9246ea2..3508e835 100644 --- a/yage/core/window.cpp +++ b/yage/core/window.cpp @@ -17,9 +17,9 @@ void key_callback(GLFWwindow *window, int key, int scanCode, int action, int mods) { if (key == GLFW_KEY_E && action == GLFW_PRESS) { - glClearColour(0.5f, 0.f, 0.f, 1.f); + glClearColor(0.5f, 0.f, 0.f, 1.f); } else { - glClearColour(0.f, 0.5f, 0.f, 1.f); + glClearColor(0.f, 0.5f, 0.f, 1.f); } } @@ -59,7 +59,7 @@ void Window::create(std::string window_name, int width, int height) glfwSwapInterval(1); // set the clear colour to black - glClearColour(0.f, 0.5f, 0.f, 1.f); + glClearColor(0.f, 0.5f, 0.f, 1.f); // set alpha blending glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -- cgit