From 23984e8370816c3f324af6ae58172c7be9ada32f Mon Sep 17 00:00:00 2001
From: Ben Visness <ben@bvisness.me>
Date: Wed, 28 Jun 2023 20:44:13 -0500
Subject: [PATCH 1/3] Enable font stuff in Orca

---
 src/graphics_common.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/graphics_common.c b/src/graphics_common.c
index e36d264..10b3cb8 100644
--- a/src/graphics_common.c
+++ b/src/graphics_common.c
@@ -17,10 +17,8 @@
 #endif
 #include"stb_image.h"
 
-#if !PLATFORM_ORCA
-	#define STB_TRUETYPE_IMPLEMENTATION
-	#include"stb_truetype.h"
-#endif
+#define STB_TRUETYPE_IMPLEMENTATION
+#include"stb_truetype.h"
 
 #include"platform/platform_log.h"
 #include"platform/platform_assert.h"
@@ -408,8 +406,6 @@ mg_font_data* mg_font_data_from_handle(mg_font handle)
 	return(data);
 }
 
-#if !PLATFORM_ORCA
-
 mg_font mg_font_create_from_memory(u32 size, byte* buffer, u32 rangeCount, unicode_range* ranges)
 {
 	if(!__mgData.init)
@@ -602,8 +598,6 @@ void mg_font_destroy(mg_font fontHandle)
 		mg_handle_recycle(fontHandle.h);
 	}
 }
-#endif // !PLATFORM_ORCA
-
 
 str32 mg_font_get_glyph_indices_from_font_data(mg_font_data* fontData, str32 codePoints, str32 backing)
 {

From 36c75a55dd1d843b29691293410344a9f48a9201 Mon Sep 17 00:00:00 2001
From: martinfouilleul <martinfouilleul@gmail.com>
Date: Sun, 2 Jul 2023 12:49:45 +0200
Subject: [PATCH 2/3] [win32] Fix first image not being rendered in win32
 canvas renderer

---
 examples/image/main.c | 4 +++-
 src/gl_canvas.c       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/image/main.c b/examples/image/main.c
index e54af88..b18acbe 100644
--- a/examples/image/main.c
+++ b/examples/image/main.c
@@ -6,6 +6,7 @@
 *	@revision:
 *
 *****************************************************************/
+#include<stdio.h>
 #include<stdlib.h>
 #include<string.h>
 #include<errno.h>
@@ -73,7 +74,6 @@ int main()
 			mg_set_color_rgba(0, 1, 1, 1);
 			mg_clear();
 
-
 			mg_set_color_rgba(1, 1, 1, 1);
 
 			mg_matrix_push((mg_mat2x3){0.707, -0.707, 200,
@@ -95,6 +95,8 @@ int main()
 
 			mg_image_draw(image2, (mp_rect){300, 200, 300, 300});
 
+
+
 			mg_render(surface, canvas);
 		mg_surface_present(surface);
 
diff --git a/src/gl_canvas.c b/src/gl_canvas.c
index c1a48f8..eb847ac 100644
--- a/src/gl_canvas.c
+++ b/src/gl_canvas.c
@@ -1733,8 +1733,8 @@ void mg_gl_canvas_render(mg_canvas_backend* interface,
 		{
 			mg_image_data* imageData = mg_image_data_from_handle(backend->image);
 			mg_gl_canvas_draw_batch(backend, imageData, backend->nextShapeIndex, backend->vertexCount, backend->indexCount);
-			backend->image = primitive->attributes.image;
 		}
+		backend->image = primitive->attributes.image;
 
 		switch(primitive->cmd)
 		{

From ff5a57fb92c301bb706dc87adb55a0ea17ac18b3 Mon Sep 17 00:00:00 2001
From: Ben Visness <ben@bvisness.me>
Date: Tue, 4 Jul 2023 16:13:28 -0500
Subject: [PATCH 3/3] Add some convenient rectangle accessors

---
 src/util/typedefs.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/util/typedefs.h b/src/util/typedefs.h
index 05a4e6f..b4a07ad 100644
--- a/src/util/typedefs.h
+++ b/src/util/typedefs.h
@@ -75,6 +75,11 @@ typedef union
 		f32 w;
 		f32 h;
 	};
+	struct
+	{
+		vec2 xy;
+		vec2 wh;
+	};
 	f32 c[4];
 } mp_rect;