V1.2 Using U+2580 for finer output

333van · Jul 8, 2023 · 73e05e6 · 73e05e6
1 parent 787a94a
commit 73e05e6
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 ![Sample Output](./OutputSample.jpg)
 
 ## Note: 
-
+- If on Linux, use [chafa](https://github.com/hpjansson/chafa)
 - For build, tested only with GCC of Mingw-w64 v12.1.0
-- For use, tested only on Windows 11 with Windows Terminal v1.15.2875.0
+- For use, tested only on the latest version of Windows 11 and Windows Terminal
 - Questions? Read the source, for it's short
 
 ## Build

diff --git a/build.ps1 b/build.ps1
@@ -0,0 +1,18 @@
+param(
+  [String]$action="build"
+)
+
+function main(){
+  if($action -eq "build")    { Start-BuildRoutinue; }
+  elseif($action -eq "test") { Start-BuildRoutinue; Start-TestRoutinue; }
+}
+
+function Start-BuildRoutinue($outputPath="sii"){
+  gcc main.c -o $outputPath
+}
+
+function Start-TestRoutinue($inputImagePath="./input.jpg"){
+  ./sii.exe $inputImagePath
+}
+
+main
diff --git a/main.c b/main.c
@@ -14,15 +14,16 @@ int main(int Arguments_Count, char** Arguments_Value)
     const int OUT_WIDTH_MAX       = 1080; // <-- Configure it
     const int OUT_WIDTH_MIN       = 16;  // <-- Configure it
     // https://en.wikipedia.org/wiki/ANSI_escape_code#24-bit
-    const char TERMINAL_PIXEL_STRING_HEAD[] = "\033[48;2;"; // Background Color Mode
+    const char TERMINAL_PIXEL_STRING_FOREGROUND_COLOR_HEAD[] = "\033[38;2;";
+    const char TERMINAL_PIXEL_STRING_BACKGROUND_COLOR_HEAD[] = ";48;2;";
     const char TERMINAL_PIXEL_STRING_TAIL[] = "\033[m";
 
     CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo;
     int TerminalHorizontalPixelCount;
     int TerminalVerticalPixelCount;
     GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &ConsoleScreenBufferInfo);
-    TerminalHorizontalPixelCount = (ConsoleScreenBufferInfo.srWindow.Right - ConsoleScreenBufferInfo.srWindow.Left + 1)/2;
-    TerminalVerticalPixelCount = ConsoleScreenBufferInfo.srWindow.Bottom - ConsoleScreenBufferInfo.srWindow.Top + 1;
+    TerminalHorizontalPixelCount = ((ConsoleScreenBufferInfo.srWindow.Right - ConsoleScreenBufferInfo.srWindow.Left + 1)/2) * 2;
+    TerminalVerticalPixelCount = (ConsoleScreenBufferInfo.srWindow.Bottom - ConsoleScreenBufferInfo.srWindow.Top + 1) * 2;
 
     const char HELP_DOC[] = 
 "ShowInputImage (sii)\n\n"
@@ -92,6 +93,9 @@ int main(int Arguments_Count, char** Arguments_Value)
         Out_Width = Out_Width_f;
     }
 
+    // Using U+2580 (Upper Half Block), and hence upscaling he size
+    // https://www.compart.com/en/unicode/block/U+2580    
+
     unsigned char* Resized_Image_Data = malloc( Out_Width * Out_Height * OUT_CHANNELS_NUM );
     stbir_resize_uint8(
         Image_Data,   Image_Width, Image_Height, 0,
@@ -101,26 +105,43 @@ int main(int Arguments_Count, char** Arguments_Value)
     // Text: Output Image
     int Pixel_Num_Max = Out_Width * Out_Height;
 
+    int x_Tracker = 0;
+
     for(
         int Pixel_Num_Current = 0; 
         Pixel_Num_Current<Pixel_Num_Max;
         Pixel_Num_Current++
         )
     {
-        int R_Index = Pixel_Num_Current * 3;
-        int G_Index = Pixel_Num_Current * 3 + 1;
-        int B_Index = Pixel_Num_Current * 3 + 2;
-        int R = Resized_Image_Data[R_Index];
-        int G = Resized_Image_Data[G_Index];
-        int B = Resized_Image_Data[B_Index];
-        printf("%s%d;%d;%dm  %s", 
-            TERMINAL_PIXEL_STRING_HEAD,
-            R, G, B,
+        int Upper_R_Index = Pixel_Num_Current * 3;
+        int Upper_G_Index = Pixel_Num_Current * 3 + 1;
+        int Upper_B_Index = Pixel_Num_Current * 3 + 2;
+        int Upper_R = Resized_Image_Data[Upper_R_Index];
+        int Upper_G = Resized_Image_Data[Upper_G_Index];
+        int Upper_B = Resized_Image_Data[Upper_B_Index];
+
+        int Lower_R_Index = (Pixel_Num_Current + Out_Width) * 3;
+        int Lower_G_Index = (Pixel_Num_Current + Out_Width) * 3 + 1;
+        int Lower_B_Index = (Pixel_Num_Current + Out_Width) * 3 + 2;
+        int Lower_R = Resized_Image_Data[Lower_R_Index];
+        int Lower_G = Resized_Image_Data[Lower_G_Index];
+        int Lower_B = Resized_Image_Data[Lower_B_Index];
+
+        printf("%s%d;%d;%d%s%d;%d;%dm▀%s", 
+            TERMINAL_PIXEL_STRING_FOREGROUND_COLOR_HEAD,
+            Upper_R, Upper_G, Upper_B,
+            TERMINAL_PIXEL_STRING_BACKGROUND_COLOR_HEAD,
+            Lower_R, Lower_G, Lower_B,
             TERMINAL_PIXEL_STRING_TAIL
         );
         if(Pixel_Num_Current != 0 && (Pixel_Num_Current+1)%Out_Width == 0){
             printf("\n");
         }
+        x_Tracker += 1;
+        if(x_Tracker == Out_Width){
+          Pixel_Num_Current += Out_Width;
+          x_Tracker = 0;
+        }
     }
 
     // Text: Memory Management