Optimised renderer and ucp transformer

Author: Smart6502

.gitignore

@@ -2,3 +2,6 @@
 *.a
 *.e
 *wall
+*.bmp
+*.jpg
+*.png

Makefile

@@ -8,7 +8,7 @@ EXSRCS := $(shell find $(EXDIR) -name '*.c' -o -name '*.cpp')
 LIBOBJS := $(addsuffix .o, $(basename $(LIBSRCS)))
 LIBA := libpluto.a
 EXBINS := $(addsuffix .e, $(basename $(EXSRCS)))
-CFLAGS = -Wall -Wextra -Werror -O3
+CFLAGS = -Wall -Wextra -Werror -O4
 LIBCFLAGS = $(CFLAGS)
 
 .PHONY: clean

examples/clfps.cpp

@@ -328,7 +328,8 @@ int main()
                             }
 
                         // Sort Pairs from closest to farthest
-                        sort(p.begin(), p.end(), [](const pair<float, float> &left, const pair<float, float> &right) { return left.first < right.first; });
+                        sort(p.begin(), p.end(), [](const pair<float, float> &left, const pair<float, float> &right)
+                             { return left.first < right.first; });
 
                         // First two/three are closest (we will never see all four)
                         float fBound = 0.001;

examples/clfps_rgb.cpp

@@ -235,7 +235,8 @@ int main()
                                 p.push_back(make_pair(d, dot));
                             }
 
-                        sort(p.begin(), p.end(), [](const pair<float, float> &left, const pair<float, float> &right) { return left.first < right.first; });
+                        sort(p.begin(), p.end(), [](const pair<float, float> &left, const pair<float, float> &right)
+                             { return left.first < right.first; });
 
                         float f_bound = 0.001;
                         if (acos(p.at(0).second) < f_bound)

examples/wall-density.c

@@ -26,7 +26,7 @@ int main()
         }
     }
     pluto_write_out();
-    fputs((char *)_pluto_canvas.buffer, fp);	// Write buffer to file
+    fputs((char *)_pluto_canvas.buffer, fp); // Write buffer to file
     fclose(fp);
 
     pluto_deinit();

src/render.c

@@ -44,7 +44,7 @@ const uint8_t _pluto_dinis[4][2] = {
 
 void pluto_transform_ucp(uchar *ret, uint16_t unichr)
 {
-    ret[0] = (uchar)(((unichr >> 12) & 0x0F) | 0xE0);
+    ret[0] = 0xE2;
     ret[1] = (uchar)(((unichr >> 6) & 0x3F) | 0x80);
     ret[2] = (uchar)(((unichr)&0x3F) | 0x80);
 }
@@ -56,6 +56,7 @@ void _pluto_lock_term()
 {
     if (_pluto_term_locked)
         return;
+
     tcgetattr(0, &_pluto_term);
     tcgetattr(0, &_pluto_old_term);
     _pluto_term.c_lflag &= ~(ICANON | ECHO);
@@ -67,15 +68,18 @@ void _pluto_unlock_term()
 {
     if (!_pluto_term_locked)
         return;
+
     tcsetattr(0, TCSANOW, &_pluto_old_term);
     _pluto_term_locked = false;
 }
 
 void pluto_write_out()
 {
     _pluto_canvas.busy = true;
+
     char buf[20];
     uchar *cbuf = (uchar *)&_pluto_canvas.buffer[3];
+
     for (int32_t i = 0; i < _pluto_canvas.bmsize; i++)
     {
         int bx = (i % _pluto_canvas.width) * 2;
@@ -86,15 +90,15 @@ void pluto_write_out()
 
         for (int y = 0; y < 4; y++)
         {
-            int yp = y + by;
+            int yp = (y + by) * (_pluto_canvas.width << 1);
 
             for (int x = 0; x < 2; x++)
             {
                 int xp = x + bx;
 
                 if (_pluto_canvas.bitmap[i] & (1 << _pluto_dinis[y][x]))
                 {
-                    pci = yp * (_pluto_canvas.width << 1) + xp;
+                    pci = yp + xp;
                     bl++;
                     tr += _pluto_canvas.pix_colour[pci].r;
                     tg += _pluto_canvas.pix_colour[pci].g;
@@ -105,23 +109,24 @@ void pluto_write_out()
 
         if (bl)
         {
-            tr /= bl;
-            tg /= bl;
-            tb /= bl;
+            tr /= bl, tg /= bl, tb /= bl;
         }
         else
         {
             tr = 255, tg = 255, tb = 255;
         }
 
         sprintf(buf, "\e[38;2;%03u;%03u;%03um", (uint8_t)tr, (uint8_t)tg, (uint8_t)tb);
-        strcpy((char *)&cbuf[i * 22 + (i / _pluto_canvas.width)], buf);
-        pluto_transform_ucp(&cbuf[i * 22 + 19 + (i / _pluto_canvas.width)], PLUTO_CHAR_OFF + _pluto_canvas.bitmap[i]);
+        int iw = i / _pluto_canvas.width;
+        strcpy((char *)&cbuf[i * 22 + iw], buf);
+        pluto_transform_ucp(&cbuf[i * 22 + 19 + iw], PLUTO_CHAR_OFF + _pluto_canvas.bitmap[i]);
     }
+
     for (int i = 1; i < _pluto_canvas.height; i++)
     {
-        cbuf[_pluto_canvas.width * 22 * i + i - 1] = '\n';
+        cbuf[(_pluto_canvas.width * 22 + 1) * i - 1] = '\n';
     }
+
     _pluto_canvas.buffer[_pluto_canvas.bufsize - 1] = 0;
     _pluto_canvas.busy = false;
 }
@@ -136,14 +141,15 @@ void pluto_render()
             putchar('\n');
 
         _pluto_first_out = false;
+
         if (_pluto_canvas.use_write)
             fflush(stdout);
     }
     if (_pluto_canvas.use_write)
     {
 #if defined(__unix__) || defined(__linux__) || defined(BSD) || defined(__APPLE__)
         int wr = write(STDOUT_FILENO, _pluto_canvas.buffer, _pluto_canvas.bufsize);
-	(void)wr; /* Debian fix */
+        (void)wr; /* Debian fix */
 #else
         fputs((char *)_pluto_canvas.buffer, stdout);
         fflush(stdout);
@@ -154,6 +160,7 @@ void pluto_render()
         fputs((char *)_pluto_canvas.buffer, stdout);
         fflush(stdout);
     }
+
     _pluto_unlock_term();
     _pluto_canvas.busy = false;
 }