Prefix all the names in olive.c with `olivec_`

demos/3d.c

@@ -73,7 +73,7 @@ Olivec_Canvas render(float dt)
     }
 
     size_t size = 8;
-    olivec_text(oc, "aboba", ABOBA_PADDING, HEIGHT - ABOBA_PADDING - default_font.height*size, default_font, size, 0xFFFFFFFF);
+    olivec_text(oc, "aboba", ABOBA_PADDING, HEIGHT - ABOBA_PADDING - olivec_default_font.height*size, olivec_default_font, size, 0xFFFFFFFF);
 
     return oc;
 }

olive.c

@@ -19,7 +19,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-// TODO: some names in olive.c are not prefixed with `olivec_` properly
 #ifndef OLIVE_C_
 #define OLIVE_C_
 
@@ -44,10 +43,10 @@ typedef struct {
     const char *glyphs;
 } Olivec_Font;
 
-#define DEFAULT_FONT_HEIGHT 6
-#define DEFAULT_FONT_WIDTH 6
+#define OLIVEC_DEFAULT_FONT_HEIGHT 6
+#define OLIVEC_DEFAULT_FONT_WIDTH 6
 // TODO: allocate proper descender and acender areas for the default font
-static char default_font_glyphs[128][DEFAULT_FONT_HEIGHT][DEFAULT_FONT_WIDTH] = {
+static char olivec_default_glyphs[128][OLIVEC_DEFAULT_FONT_HEIGHT][OLIVEC_DEFAULT_FONT_WIDTH] = {
     ['a'] = {
         {0, 0, 0, 0, 0},
         {0, 1, 1, 0, 0},
@@ -309,10 +308,10 @@ static char default_font_glyphs[128][DEFAULT_FONT_HEIGHT][DEFAULT_FONT_WIDTH] =
     },
 };
 
-static Olivec_Font default_font = {
-    .glyphs = &default_font_glyphs[0][0][0],
-    .width = DEFAULT_FONT_WIDTH,
-    .height = DEFAULT_FONT_HEIGHT,
+static Olivec_Font olivec_default_font = {
+    .glyphs = &olivec_default_glyphs[0][0][0],
+    .width = OLIVEC_DEFAULT_FONT_WIDTH,
+    .height = OLIVEC_DEFAULT_FONT_HEIGHT,
 };
 
 typedef struct {

test.c

@@ -392,7 +392,7 @@ Olivec_Canvas test_hello_world_text_rendering(void)
     size_t text_len = strlen(text);
     Olivec_Canvas oc = canvas_alloc(400, 150);
     olivec_fill(oc, BACKGROUND_COLOR);
-    olivec_text(oc, text, oc.width/2 - DEFAULT_FONT_WIDTH*size*text_len/2, oc.height/2 - DEFAULT_FONT_HEIGHT*size/2, default_font, size, FOREGROUND_COLOR);
+    olivec_text(oc, text, oc.width/2 - OLIVEC_DEFAULT_FONT_WIDTH*size*text_len/2, oc.height/2 - OLIVEC_DEFAULT_FONT_HEIGHT*size/2, olivec_default_font, size, FOREGROUND_COLOR);
     return oc;
 }