From 61b2725ef174e4cec734e29bce4f69d6fcd2a813 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 24 Aug 2024 13:54:14 +0200 Subject: Vertices: fix alpha blending when window background is transparent, add uniform for color, add position for vertices draw --- src/graphics/Shader.cpp | 4 ++++ src/window/Window.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/graphics/Shader.cpp b/src/graphics/Shader.cpp index 2bdc9b2..111f39d 100644 --- a/src/graphics/Shader.cpp +++ b/src/graphics/Shader.cpp @@ -34,6 +34,10 @@ namespace mgl { return mgl_shader_program_set_uniform_vec2f(&shader_program, name, { value.x, value.y }) == 0; } + bool Shader::set_uniform(const char *name, Color color) { + return mgl_shader_program_set_uniform_color(&shader_program, name, { color.r, color.g, color.b, color.a }) == 0; + } + bool Shader::is_valid() const { return shader_program.id != 0; } diff --git a/src/window/Window.cpp b/src/window/Window.cpp index 0e80456..8cfc28e 100644 --- a/src/window/Window.cpp +++ b/src/window/Window.cpp @@ -53,13 +53,13 @@ namespace mgl { Shader::use(nullptr); } - void Window::draw(const Vertex *vertices, size_t vertex_count, PrimitiveType primitive_type, Shader *shader) { + void Window::draw(const Vertex *vertices, size_t vertex_count, PrimitiveType primitive_type, mgl::vec2f position, Shader *shader) { // TODO: Make the opengl context active for this thread and window, if it already isn't if(shader) Shader::use(shader); mgl_context *context = mgl_get_context(); - mgl_vertices_draw(context, (const mgl_vertex*)vertices, vertex_count, (mgl_primitive_type)primitive_type, { 0.0f, 0.0f }); + mgl_vertices_draw(context, (const mgl_vertex*)vertices, vertex_count, (mgl_primitive_type)primitive_type, { position.x, position.y }); if(shader) Shader::use(nullptr); -- cgit v1.2.3