revert main.c to older version

ColleagueRiley · Dec 17, 2023 · 43026df · 43026df
1 parent 226581d
commit 43026df
Showing 1 changed file with 15 additions and 23 deletions.
diff --git a/example/main.c b/example/main.c
@@ -1,15 +1,13 @@
 #define RGFW_IMPLEMENTATION
 #define RFONT_IMPLEMENTATION
 #define RLGL_IMPLEMENTATION
-#define RGL_IMPLEMENTATION
 
 #ifdef RFONT_RENDER_LEGACY
 #define GRAPHICS_API_OPENGL_11
 #endif
 
-
 #ifdef RFONT_RENDER_RLGL
-#include "RGL.h"
+#include "rlgl.h"
 #endif
 
 #if !defined(RFONT_RENDER_LEGACY) && !defined(RFONT_RENDER_RLGL)
@@ -21,7 +19,6 @@
 #include "ext/glad.h"
 #endif
 
-
 #include "RFont.h"
 
 #include "RGFW.h"
@@ -36,13 +33,14 @@ struct timeval GetTimeStamp() {
 
 int main(int argc, char **argv) {
     RGFW_setGLVersion(3, 3);
-
+    
     RGFW_window* win = RGFW_createWindow((argc > 1) ? argv[1] : "window", 200, 200, 1000, 500, 0);
+
+    #if defined(RFONT_RENDER_RLGL) && !defined(RFONT_RENDER_LEGACY)
+    rlLoadExtensions((void*)RGFW_getProcAddress);        
+    rlglInit(win->w, win->h);  
 
-    #if defined(RFONT_RENDER_RLGL) && !defined(RFONT_RENDER_LEGACY)       
-    rglInit(win->w, win->h, (void*)RGFW_getProcAddress);  
-
-    //rlDrawRenderBatchActive();      // Update and draw internal render batch
+    rlDrawRenderBatchActive();      // Update and draw internal render batch
     #endif
 
     #if !defined(RFONT_RENDER_LEGACY) && !defined(RFONT_RENDER_RLGL)
@@ -53,8 +51,7 @@ int main(int argc, char **argv) {
     glClear(GL_COLOR_BUFFER_BIT);
 
     RFont_init(win->w, win->h);
-    //"../helvetica.ttf"
-    RFont_font* font = RFont_font_init("../helvetica.ttf");
+    RFont_font* font = RFont_font_init("DejaVuSans.ttf");
     RFont_font* japanese = RFont_font_init("DroidSansJapanese.ttf");
 
     bool running = true;
@@ -69,40 +66,35 @@ int main(int argc, char **argv) {
 
         glClearColor(0.3f, 0.3f, 0.32f, 1.0f);
         glClear(GL_COLOR_BUFFER_BIT);
-
-        RFont_set_color(0.0f, 1.0f, 0, 1.0f);
-        RFont_draw_text_spacing(font, "Adventure\nButton", 0, 0, 60, 0);
 
-        //RFont_draw_text(font, "abcdefghijklmnopqrstuvwxyz\n1234567890@.<>,/?\\|[{]}", 0, 0, 60);
+        RFont_set_color(0.0f, 1.0f, 0, 1.0f);
 
+        RFont_draw_text(font, "abcdefghijklmnopqrstuvwxyz\n1234567890@.<>,/?\\|[{]}", 0, 0, 60);
         RFont_draw_text_spacing(font, "`~!#$%^&*()_-=+", 0, 120, 60, 1.0f);
         RFont_set_color(1.0f, 0.0f, 0, 1.0f);
         RFont_draw_text(font, "ABCDEFGHIJKLMNOPQRSTUVWXYZ\nSomething about a fast lazy dog.", 0, 210, 20);
         RFont_set_color(0.0f, 1.0f, 0, 1.0f);
         RFont_draw_text(font, "RFont_draw_text(); ⌫§", 0, 240, 60);
         RFont_set_color(1.0f, 0.0f, 0, 1.0f);
-
-        RFont_draw_text(font, RFont_fmt("FPS : %i", win->event.fps), 0, 300, 60);
-
+        RFont_draw_text(japanese, "テキスト例", 0, 300, 60);
+
         #if defined(RFONT_RENDER_RLGL)
-        rglRenderBatch();
-        //rlDrawRenderBatchActive();      // Update and draw internal render batch
+        rlDrawRenderBatchActive();      // Update and draw internal render batch
         #endif
 
         RGFW_window_swapBuffers(win);
 
         #if defined(RFONT_RENDER_RLGL) && !defined(RFONT_RENDER_LEGACY)
-        rglSetFramebufferSize(win->w, win->h);  
+        rlSetFramebufferSize(win->w, win->h);  
         RFont_update_framebuffer(win->w, win->h);
         #endif
     }
 
     RFont_font_free(font);
     RFont_font_free(japanese);
-    RFont_close();
 
     #if defined(RFONT_RENDER_RLGL) && !defined(RFONT_RENDER_LEGACY)
-    rglClose();
+    rlglClose();
     #endif
 
     RGFW_window_close(win);