Skip to content

Commit

Permalink
Merge branch 'codewithnick:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
anchaldubey123 authored Oct 24, 2023
2 parents 6918c87 + 4c28af6 commit 5644081
Show file tree
Hide file tree
Showing 9 changed files with 229 additions and 120 deletions.
16 changes: 10 additions & 6 deletions Fonts/Boomer/boomer.h
Original file line number Diff line number Diff line change
Expand Up @@ -687,17 +687,21 @@ class Boomer : public Fonts
return character;
}

/*
char **one()
{
char **character = getCharGrid(ROWS,COLS);
//Enter the character grid in ROWS X COLS
char **character = getCharGrid(6,7);

character[0][1] = character[0][2] = character[0][3] =character[4][0]=character[4][5]=character[5][1]=character[5][2]=character[5][3]=character[5][4]='_';
character[1][0]=character[5][5]='/';
character[2][0]='`';
character[2][1]=character[3][1]=character[4][1]='|';
character[1][4]=character[2][4]=character[3][4]=character[4][4]='|';
character[5][0]='\\';

return character;
}

*/


char **two()
{
Expand Down
10 changes: 6 additions & 4 deletions Fonts/Straight/straight.h
Original file line number Diff line number Diff line change
Expand Up @@ -322,16 +322,18 @@ class Straight : public Fonts

// Lowercase

/*
char **a()
char **a()
{
char **character = getCharGrid(ROWS,COLS);
char **character = getCharGrid(4,4);

//Enter the character grid in ROWS X COLS
character[1][1] = '_';
character[2][0] = '(';
character[2][1] = '_';
character[2][2] = '|';

return character;
}
*/

char **b()
{
Expand Down
77 changes: 48 additions & 29 deletions Fonts/amongus/amongus.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,21 @@ class Amongus : public Fonts
}


/*

char **C()
{
char **character = getCharGrid(ROWS,COLS);
char **character = getCharGrid(4,6);

//Enter the character grid in ROWS X COLS
character[0][2]=character[0][3]=character[0][4]=character[1][3]=character[1][4]=
character[2][3]=character[2][4]=character[3][2]=character[3][3]=character[3][4]='_';
character[1][5]=character[3][5]=')';
character[2][0]=character[2][2]='(';
character[1][1]='/';
character[3][1]='\\';

return character;
}
*/


/*
char **D()
{
Expand All @@ -66,38 +70,51 @@ class Amongus : public Fonts
}
*/

/*

char **E()
{
char **character = getCharGrid(ROWS,COLS);
//Enter the character grid in ROWS X COLS
char **character = getCharGrid(4,6);
character[1][0]= character[3][0]= '(';
character[1][5]= character[2][1]= character[2][4]= character[3][5]= ')';
character[1][2]= character[1][3]= character[1][4]= character[2][2]= character[2][3]= character[3][2]= character[3][3]=character[3][4]= character[0][1]= character[0][2]= character[0][3]= character[0][4]='_';


return character;
return character;
}
*/


/*

char **F()
{
char **character = getCharGrid(ROWS,COLS);
char **character = getCharGrid(4,6);
character[0][1]= character[0][2]= character[0][3]= character[0][4]= character[1][2]= character[1][3]= character[1][4]= character[2][2]= character[2][3]= character[3][1]= character[3][2]='_';
character[1][0]= character[3][0]='(';
character[1][5]= character[2][1]= character[2][4]= character[3][3]=')';

//Enter the character grid in ROWS X COLS



return character;
}
*/


/*

char **G()
{
char **character = getCharGrid(ROWS,COLS);
char **character = getCharGrid(4,6);
character[0][2]=character[0][3]=character[0][4]=character[1][3]=character[1][4]=character[2][3]=character[3][2]=character[3][3]=character[3][4]='_';
character[2][0]=character[2][2]='(';
character[1][5]=')';
character[1][1]=character[3][5]='/';
character[3][1]='\\';
character[2][4]='-';
character[2][5]='.';

//Enter the character grid in ROWS X COLS

return character;
}
*/

/*
char **H()
Expand Down Expand Up @@ -143,16 +160,16 @@ class Amongus : public Fonts
}
*/

/*
char **L()
{
char **character = getCharGrid(ROWS,COLS);
char **character = getCharGrid(4,6);

//Enter the character grid in ROWS X COLS
character[0][1]= character[0][2]=character[2][3]=character[2][4]=character[3][1]=character[3][2]=character[3][3]=character[3][4]='_';
character[1][0]=character[2][2]=character[3][0]='(';
character[1][3]=character[2][1]=character[3][5]=')';
return character;
}
*/

/*
char **M()
Expand Down Expand Up @@ -619,18 +636,20 @@ class Amongus : public Fonts

// Numbers

/*
char **zero()
{
char **character = getCharGrid(ROWS,COLS);
//Enter the character grid in ROWS X COLS
char **character = getCharGrid(4,7);
character[0][2]=character[0][3]=character[0][4]=character[3][2]=character[3][3]=
character[3][4]=character[1][3]=character[2][3] = '_';
character[1][1]=character[3][5] = '/';
character[1][5]=character[3][1] = '\\';
character[2][0]=character[2][2] = '(';
character[2][4]=character[2][6] = ')';


return character;
}

*/

/*
char **one()
{
Expand Down Expand Up @@ -743,4 +762,4 @@ class Amongus : public Fonts
*/
};
#endif
#endif
11 changes: 7 additions & 4 deletions Fonts/banner/banner.h
Original file line number Diff line number Diff line change
Expand Up @@ -560,17 +560,20 @@ class Banner : public Fonts
return character;
}

/*

char **two()
{
char **character = getCharGrid(ROWS,COLS);
char **character = getCharGrid(7,7);

//Enter the character grid in ROWS X COLS
character[0][1]=character[0][2]=character[0][3]=character[0][4]=character[0][5]=character[1][0]=character[1][6]=character[2][6]=character[3][5]=character[3][4]=character[3][3]='#';
character[3][2]=character[3][1]='#';
character[4][0]=character[5][0]=character[6][0]=character[6][1]=character[6][2]=character[6][3]='#';
character[6][4]=character[6][5]=character[6][6]='#';

return character;
}

*/


char **three()
{
Expand Down
21 changes: 17 additions & 4 deletions Fonts/block/block.h
Original file line number Diff line number Diff line change
Expand Up @@ -416,16 +416,29 @@ class Block : public Fonts
}
*/

/*

char **Z()
{
char **character = getCharGrid();
char **character = getCharGrid(11, 20);

//Enter the character grid in ROWS X COLS
character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[0][7] = character[0][8] = character[0][9] = character[0][10] = character[0][11] = character[0][12] = character[0][13] = character[0][14] = character[0][15] = character[0][16] = character[0][17] = character[1][3] = character[1][4] = character[1][5] = character[1][6] = character[1][7] = character[1][8] = character[1][9] = character[1][10] = character[1][11] = character[1][12] = character[1][13] = character[1][14] = character[1][15] = character[1][16] = '-';
character[9][3] = character[9][4] = character[9][5] = character[9][6] = character[9][7] = character[9][10] = character[9][11] = character[9][12] = character[9][13] = character[9][14] = character[9][15] = character[9][16] = character[10][2] = character[10][3] = character[10][4] = character[10][5] = character[10][6] = character[10][7] = character[10][8] = character[10][9] = character[10][10] = character[10][11] = character[10][12] = character[10][13] = character[10][14] = character[10][15] = character[10][16] = character[10][17] = character[9][8] = character[9][9] = '-';
character[1][0] = character[2][0] = character[3][0] = character[4][0] = character[5][0] = character[6][0] = character[7][0] = character[8][0] = character[9][0] = character[2][2] = character[3][2] = character[4][2] = character[5][2] = character[6][2] = character[7][2] = character[8][2] = '|';
character[1][19] = character[2][19] = character[3][19] = character[4][19] = character[5][19] = character[6][19] = character[7][19] = character[8][19] = character[9][19] = character[2][17] = character[3][17] = character[3][17] = character[4][17] = character[5][17] = character[6][17] = character[7][17] = character[8][17] = '|';
character[0][1] = character[0][18] = character[1][2] = character[1][17] = character[9][2] = character[9][17] = '.';
character[10][1] = character[10][18] = '\'';

character[2][6] = character[2][7] = character[2][7] = character[2][8] = character[2][9] = character[2][10] = character[2][11] = character[2][12] = character[2][13] = character[4][6] = character[3][8] = character[3][9] = character[3][13] = character[6][6] = character[6][10] = character[6][11] = character[5][13] = '_';
character[6][14] = character[7][5] = character[3][5] = character[4][5] = character[3][14] = character[7][14] = '|';
character[4][7] = character[4][10] = character[4][12] = character[5][8] = character[6][7] = character[6][9] = character[6][12] = '/';
character[5][9] = character[5][11] = '\'';
character[5][8] = character[5][10] = '.';
character[7][6] = character[7][7] = character[7][7] = character[7][8] = character[7][9] = character[7][10] = character[7][11] = character[7][12] = character[7][13] = '_';


return character;
}
*/


// Lowercase

Expand Down
4 changes: 2 additions & 2 deletions Fonts/carlos/carlos.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ For more designs refer to jacky at [ascii-generater](https://ascii-generator.sit
____
( )
/ /\ \
( (__) )
) (
( (__) )
) (
/ /\ \
/__( )__\

Expand Down
48 changes: 26 additions & 22 deletions Fonts/drpepper/drpepper.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ class Drpepper : public Fonts
}
*/

/*
char **E()
{
char **character = getCharGrid(rows,cols);
//Enter the character grid in ROWS X COLS
return character;
}
*/
char **E()
{
char **character = getCharGrid(4, 5);
character[0][0] = character[0][4] = character[1][1] = character[2][1] = character[2][4] = ' ';
character[0][1] = character[0][2] = character[0][3] = character[1][2] = character[1][3] = character[2][2] = character[3][1] = character[3][2] = character[3][3] = '_';
character[1][0] = character[2][0] = character[3][0] = '|';
character[1][4] = character[2][3] = character[3][4] = '>';
return character;
}


char **F()
{
Expand Down Expand Up @@ -206,16 +206,19 @@ class Drpepper : public Fonts
}
*/

/*
char **S()
{
char **character = getCharGrid(rows,cols);
{

//Enter the character grid in ROWS X COLS
char **character = getCharGrid(4, 5);
character[0][1] =character[0][2]=character[1][2]=character[1][1]=character[3][2]=character[3][1]=character[2][1]=character[0][3]=character[1][3]=character[3][3]=character[2][2]= '_';
character[3][4]=character[1][0]='/';
character[1][4]='>';
character[3][0]='<';
character[2][0]=character[2][4]=char(92);
return character;
}

return character;
}
*/


char **T()
{
Expand Down Expand Up @@ -418,17 +421,18 @@ character[1][4] = character[2][4] = '|';
*/

/*
char **l()

char **l()
{
char **character = getCharGrid(rows,cols);
char **character = getCharGrid(4,3);

//Enter the character grid in ROWS X COLS
character[0][1]=character[3][1]='_';
character[1][0]=character[2][0]=character[3][0]=character[1][2]=character[2][2]=character[3][2]='|';
return character;
}

*/


/*
char **m()
Expand Down
2 changes: 1 addition & 1 deletion example.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ using namespace ascii;

int main()
{
Ascii a = Ascii(banner);
Ascii a = Ascii(drpepper);
a.print("l");
return 0;
}
Loading

0 comments on commit 5644081

Please sign in to comment.