aboutsummaryrefslogtreecommitdiff
path: root/include/mgl/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'include/mgl/graphics')
-rw-r--r--include/mgl/graphics/image.h1
-rw-r--r--include/mgl/graphics/sprite.h2
-rw-r--r--include/mgl/graphics/text.h13
3 files changed, 11 insertions, 5 deletions
diff --git a/include/mgl/graphics/image.h b/include/mgl/graphics/image.h
index b10a028..40625bb 100644
--- a/include/mgl/graphics/image.h
+++ b/include/mgl/graphics/image.h
@@ -21,6 +21,7 @@ struct mgl_image {
};
int mgl_image_load_from_file(mgl_image *self, const char *filepath);
+int mgl_image_load_from_memory(mgl_image *self, const unsigned char *data, size_t size);
void mgl_image_unload(mgl_image *self);
size_t mgl_image_get_size(mgl_image *self);
diff --git a/include/mgl/graphics/sprite.h b/include/mgl/graphics/sprite.h
index 8c84153..03f81ab 100644
--- a/include/mgl/graphics/sprite.h
+++ b/include/mgl/graphics/sprite.h
@@ -8,7 +8,7 @@ typedef struct mgl_context mgl_context;
typedef struct mgl_texture mgl_texture;
typedef struct {
- mgl_texture *texture;
+ mgl_texture *texture; /* nullable */
mgl_color color;
mgl_vec2f position;
mgl_vec2f scale;
diff --git a/include/mgl/graphics/text.h b/include/mgl/graphics/text.h
index 33c75d0..2c2eeaf 100644
--- a/include/mgl/graphics/text.h
+++ b/include/mgl/graphics/text.h
@@ -8,18 +8,23 @@ typedef struct mgl_font mgl_font;
typedef struct mgl_context mgl_context;
typedef struct {
- mgl_font *font;
- const char *text;
+ mgl_font *font; /* nullable */
+ const char *text; /* nullable */
mgl_color color;
mgl_vec2f position;
} mgl_text;
-/* Note: keeps a reference to |text|. |text| needs to be valid as long as |self| is used. */
+/*
+ Note: keeps a reference to |text|. |text| needs to be valid as long as |self| is used.
+ |font| and |text| may be NULL.
+*/
int mgl_text_init(mgl_text *self, mgl_font *font, const char *text, float x, float y);
void mgl_text_deinit(mgl_text *self);
-/* Note: keeps a reference to |text|. |text| needs to be valid as long as |self| is used. */
+/* Note: keeps a reference to |text|. |text| needs to be valid as long as |self| is used. |text| may be NULL. */
void mgl_text_set_string(mgl_text *self, const char *str);
+/* |font| may be NULL */
+void mgl_text_set_font(mgl_text *self, mgl_font *font);
void mgl_text_set_position(mgl_text *self, mgl_vec2f position);
void mgl_text_set_color(mgl_text *self, mgl_color color);
void mgl_text_draw(mgl_context *context, mgl_text *text);