diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/graphics/sprite.c | 15 | ||||
-rw-r--r-- | src/graphics/text.c | 8 | ||||
-rw-r--r-- | src/window/window.c (renamed from src/window.c) | 4 |
3 files changed, 18 insertions, 9 deletions
diff --git a/src/graphics/sprite.c b/src/graphics/sprite.c index 274278c..2b290bb 100644 --- a/src/graphics/sprite.c +++ b/src/graphics/sprite.c @@ -9,6 +9,14 @@ void mgl_sprite_init(mgl_sprite *self, mgl_texture *texture, float x, float y) { self->scale = (mgl_vec2f){ 1.0f, 1.0f }; } +void mgl_sprite_set_position(mgl_sprite *self, mgl_vec2f position) { + self->position = position; +} + +void mgl_sprite_set_color(mgl_sprite *self, mgl_color color) { + self->color = color; +} + /* TODO: Cache texture bind to not bind texture if its already bound and do not bind texture 0 */ void mgl_sprite_draw(mgl_context *context, mgl_sprite *sprite) { context->gl.glColor4f(sprite->color.r, sprite->color.g, sprite->color.b, sprite->color.a); @@ -28,10 +36,3 @@ void mgl_sprite_draw(mgl_context *context, mgl_sprite *sprite) { context->gl.glEnd(); context->gl.glBindTexture(GL_TEXTURE_2D, 0); } - -void mgl_sprite_set_color(mgl_sprite *self, float r, float g, float b, float a) { - self->color.r = r; - self->color.g = g; - self->color.b = b; - self->color.a = a; -} diff --git a/src/graphics/text.c b/src/graphics/text.c index 204d1e0..9afc204 100644 --- a/src/graphics/text.c +++ b/src/graphics/text.c @@ -14,6 +14,14 @@ void mgl_text_deinit(mgl_text *self) { } +void mgl_text_set_position(mgl_text *self, mgl_vec2f position) { + self->position = position; +} + +void mgl_text_set_color(mgl_text *self, mgl_color color) { + self->color = color; +} + static void mgl_text_draw_glyph(mgl_context *context, mgl_font_glyph *glyph, mgl_vec2f position) { context->gl.glTexCoord2f(glyph->texture_position.x, glyph->texture_position.y); context->gl.glVertex3f(position.x + glyph->position.x, position.y + glyph->position.y, 0.0f); diff --git a/src/window.c b/src/window/window.c index 8042ad3..3c5ce56 100644 --- a/src/window.c +++ b/src/window/window.c @@ -1,5 +1,5 @@ -#include "../include/mgl/window/window.h" -#include "../include/mgl/mgl.h" +#include "../../include/mgl/window/window.h" +#include "../../include/mgl/mgl.h" #include <X11/Xutil.h> #include <errno.h> #include <stdio.h> |