small changes of function names

BrunoLevy · Jan 19, 2024 · 06e8210 · 06e8210
1 parent a5a8703
commit 06e8210
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/GL_tty.h b/GL_tty.h
@@ -160,8 +160,8 @@ static inline void GL_end_frame(int delay) {
 #endif   
 }
 
-typedef void (*GL_pixelfunc)(int x, int y, uint8_t* r, uint8_t* g, uint8_t* b);
-typedef void (*GL_fpixelfunc)(int x, int y, float* r, float* g, float* b);
+typedef void (*GL_pixelfunc_RGB)(int x, int y, uint8_t* r, uint8_t* g, uint8_t* b);
+typedef void (*GL_pixelfunc_RGBf)(int x, int y, float* r, float* g, float* b);
 
 /**
  * \brief Draws an image by calling a user-specified function for each pixel.
@@ -171,8 +171,8 @@ typedef void (*GL_fpixelfunc)(int x, int y, float* r, float* g, float* b);
  *   the pixel's color.
  * \details Uses half-charater pixels.
  */
-static inline void GL_scan(
-    int width, int height, GL_pixelfunc do_pixel
+static inline void GL_scan_RGB(
+    int width, int height, GL_pixelfunc_RGB do_pixel
 ) {
     uint8_t r1, g1, b1;
     uint8_t r2, g2, b2;
@@ -209,8 +209,8 @@ static inline uint8_t GL_ftoi(float f) {
  *  fr,fg,fb of the pixel's color.
  * \details Uses half-charater pixels.
  */
-static inline void GL_fscan(
-    int width, int height, GL_fpixelfunc do_pixel
+static inline void GL_scan_RGBf(
+    int width, int height, GL_pixelfunc_RGBf do_pixel
 ) {
     float fr1, fg1, fb1;
     float fr2, fg2, fb2;

diff --git a/hello_graphics.c b/hello_graphics.c
@@ -9,7 +9,7 @@ int main() {
             int r = (24-i)*5;
             int g = i*5;
             int b = j*3;
-            GL_setpixel(j,i,r,g,b);
+            GL_setpixelRGB(j,i,r,g,b);
         }
     }
     GL_terminate();

diff --git a/tinyraytracer.c b/tinyraytracer.c
@@ -6,7 +6,7 @@
 #include <math.h>
 
 
-// It is 80x50 (rather than 80x25) because GL_scan() and GL_fscan()
+// It is 80x50 (rather than 80x25) because GL_scan_RGB() and GL_scan_RGBf()
 // use "double resolution" "pixels".
 //
 // Default 80x50 may feel to small, you can use larger value (and enlarge
@@ -322,7 +322,7 @@ void render(int x, int y, float* r, float* g, float* b) {
 int main() {
     init_scene();
     GL_init();
-    GL_fscan(GL_width, GL_height, render);
+    GL_scan_RGBf(GL_width, GL_height, render);
     GL_terminate();
     return 0;
 }