1 files changed, 23 insertions, 14 deletions
diff --git a/src/renderer/Renderer.cpp b/src/renderer/Renderer.cpp
index 413b3cb..f10319a 100644
--- a/src/renderer/Renderer.cpp
+++ b/src/renderer/Renderer.cpp
@@ -70,33 +70,42 @@ Renderer::Clear(Color color)
 }
 
 void
-Renderer::PushRectangle(RectF32 rect, float z, Color color)
+Renderer::PushMonoBitmap(MonoBitmap& bitmap, V3F32 pos, Color color)
+{
+    m_render_entities.emplace_back(REntity{.bitmap{
+            REntityType_MonoBitmap,
+            pos,
+            bitmap,
+            color
+    }});
+    m_sort_entries.emplace_back(pos.z, m_render_entities.size()-1);
+}
+
+void
+Renderer::PushRectangle(Rectangle rect, float z, Color color)
 {
     m_render_entities.emplace_back(REntity{.rect{
             REntityType_Rectangle,
-            rect.x0, rect.y0,
-            rect.x1, rect.y1,
+            rect,
             z,
-            color}
-    });
+            color
+    }});
     m_sort_entries.emplace_back(z, m_render_entities.size()-1);
 }
 
 void
-Renderer::PushMonoBitmap(V3F32 pos, int w, int h, void *data)
+Renderer::PushCircle(Circle circle, float z, Color color)
 {
-    m_render_entities.emplace_back(REntity{.bitmap{
-            REntityType_MonoBitmap,
-            pos.x, pos.y,
-            w, h,
-            pos.z,
-            data
+    m_render_entities.emplace_back(REntity{.circle{
+            REntityType_Circle,
+            circle,
+            z,
+            color
     }});
-    m_sort_entries.emplace_back(pos.z, m_render_entities.size()-1);
+    m_sort_entries.emplace_back(z, m_render_entities.size()-1);
 }
 
 
-
 /* temporary helper functions (from old RGroup api) */
 
 float