feat: Allow -C to specify multi-color, custom palette - #200
Open
Texarkanine wants to merge 1 commit into
Open
Conversation
Texarkanine
changed the title
Texarkanine
commented
May 4, 2025
Comment on lines
+895
to
+897
| if (num_colors > 0 && color_array != NULL) { | ||
| // Rainbow mode with custom color palette | ||
| mcolor = color_array[rand() % num_colors]; |
Author
There was a problem hiding this comment.
Rainbow Mode - Render
When in rainbow mode AND there's a custom color palette, colors are randomly picked from that palette instead of the default 6 colors.
Texarkanine
commented
May 4, 2025
Comment on lines
+923
to
+925
| } else if (num_colors > 0) { | ||
| // Multi-color mode - use stored character colors | ||
| mcolor = matrix[i][j].color; |
Author
There was a problem hiding this comment.
Multi-Color Mode - Render
A color was assigned to the character when it entered the matrix; just use it.
Texarkanine
commented
May 4, 2025
Comment on lines
+739
to
+744
| case '+': | ||
| rainbow = 0; | ||
| if (original_num_colors > 0) { | ||
| num_colors = original_num_colors; // Restore multi-color mode | ||
| } | ||
| break; |
Author
There was a problem hiding this comment.
shift + + will switch into non-rainbow multi-color mode.
Texarkanine
commented
May 4, 2025
Comment on lines
+427
to
+438
| /* Parse each color */ | ||
| char *token = strtok(colors_copy, ","); | ||
| while (token != NULL) { | ||
| int color = parse_color(token); | ||
| if (color == -1) { | ||
| free(colors_copy); | ||
| c_die(" Invalid color selection '%s'\n Valid " | ||
| "colors are green, red, blue, " | ||
| "white, yellow, cyan, magenta and black.\n", token); | ||
| } | ||
| color_array[num_colors++] = color; | ||
| token = strtok(NULL, ","); |
Author
There was a problem hiding this comment.
Multi-Color - Init
We don't deduplicate the colors when parsing, so -C red,red,blue will result in 2x as much red as blue. This is on purpose to allow more nuanced color mixes.
Texarkanine
commented
May 4, 2025
Comment on lines
+345
to
+364
| /** | ||
| * Selects a color for a matrix character based on current global program state. | ||
| * | ||
| * This function uses GLOBAL STATE variables: | ||
| * - num_colors: Number of colors in the custom palette | ||
| * - color_array: Array of custom color values | ||
| * - rainbow: Flag indicating if rainbow mode is active | ||
| * - mcolor: Current default color | ||
| * | ||
| * @return The selected color value (COLOR_* constant) | ||
| */ | ||
| int select_matrix_color(void) { | ||
| if (num_colors > 0 && color_array != NULL && !rainbow) { | ||
| /* Multi-color mode - select from custom palette */ | ||
| return color_array[rand() % num_colors]; | ||
| } else { | ||
| /* Single color mode or no custom palette - use global color */ | ||
| return mcolor; | ||
| } | ||
| } |
Author
There was a problem hiding this comment.
DRY
This specific code was repeated a lot; made it its own function to reduce total lines of code & opportunity for error.
Texarkanine
commented
May 4, 2025
Comment on lines
-326
to
-327
| int mcolor = COLOR_GREEN; | ||
| int rainbow = 0; |
Author
There was a problem hiding this comment.
These were hoisted to global:
mcolorbecause we need to initialize a color invar_init(), and it made sense to use "the current default color" to do so - but in order to do so,mcolorcouldn't be local tomain().rainbowto allow theselect_matrix_colorfunction to be global.
Texarkanine
commented
May 4, 2025
Comment on lines
+99
to
+100
| int mcolor = COLOR_GREEN; /* Current matrix color */ | ||
| int rainbow = 0; /* Flag for rainbow mode */ |
Author
There was a problem hiding this comment.
These were hoisted out of main(); see https://github.com/abishekvashok/cmatrix/pull/200/files#r2072735532
Texarkanine
commented
May 4, 2025
Comment on lines
+200
to
+221
| /* Parse a color name and return the corresponding COLOR_* constant */ | ||
| int parse_color(const char* color_name) { | ||
| if (!strcasecmp(color_name, "green")) { | ||
| return COLOR_GREEN; | ||
| } else if (!strcasecmp(color_name, "red")) { | ||
| return COLOR_RED; | ||
| } else if (!strcasecmp(color_name, "blue")) { | ||
| return COLOR_BLUE; | ||
| } else if (!strcasecmp(color_name, "white")) { | ||
| return COLOR_WHITE; | ||
| } else if (!strcasecmp(color_name, "yellow")) { | ||
| return COLOR_YELLOW; | ||
| } else if (!strcasecmp(color_name, "cyan")) { | ||
| return COLOR_CYAN; | ||
| } else if (!strcasecmp(color_name, "magenta")) { | ||
| return COLOR_MAGENTA; | ||
| } else if (!strcasecmp(color_name, "black")) { | ||
| return COLOR_BLACK; | ||
| } else { | ||
| return -1; /* Invalid color */ | ||
| } | ||
| } |
Author
There was a problem hiding this comment.
We needed to parse colors in two places, so this big if/else was pulled out into its own function.
Texarkanine
marked this pull request as ready for review
May 4, 2025 23:34
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
-C color[,color[,color ...]]Allow the
-Cflag for color selection to specify multi-color palettes.e.g.
cmatrix -C red,white,bluecmatrix -C white,white,white,greenrainbow
-r(rainbow), the rainbow will be taken from the provided color palette instead of the full spectrum.-r, each character will be randomly assigned a color from the palette when it first appears on-screen.key shortcuts
At runtime, key combo
shift++will switch to multi-color mode, if another key combo shifted out of it.compatibility
cmatrix -C red, etc, is unchanged.-r(rainbow) is unchanged if no palette is specified.example
cmatrix.color.mix.demo.mp4