Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
AnshumanMahato authored Oct 25, 2023
2 parents 3f77964 + 52fc0b9 commit fc960cc
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 52 deletions.
49 changes: 31 additions & 18 deletions Fonts/amongus/amongus.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,17 @@ class Amongus : public Fonts
return character;
}

/*

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

return character;
}
*/


char **J()
{
Expand Down Expand Up @@ -216,16 +217,21 @@ class Amongus : public Fonts
}
*/

/*

char **P()
{
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[0][3]=character[0][4]=character[1][3]=character[2][2]=character[2][3]=character[2][4]=character[3][1]=character[3][2]='_';
character[1][0]=character[3][0]='(';
character[2][1]=character[3][3]=')';
character[1][5]='\\';
character[2][5]='/';

return character;
}
*/


/*
char **Q()
Expand Down Expand Up @@ -693,29 +699,36 @@ class Amongus : public Fonts
return character;
}

/*

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

character[0][1]=character[0][2]=character[3][1]=character[3][2] = '_';
character[1][0]='/';
character[1][3]= character[2][1]=character[3][3] = ')';
character[2][2]=character[3][0] = '(';
return character;
}

*/


/*

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

//Enter the character grid in ROWS X COLS


return character;
}

*/


/*
char **three()
Expand Down
54 changes: 41 additions & 13 deletions Fonts/block/block.h
Original file line number Diff line number Diff line change
Expand Up @@ -404,16 +404,26 @@ class Block : public Fonts
return character;
}

/*

char **T()
{
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[10][1] = character[10][18] = character[9][2] = character[9][17] = '\'';

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

return character;
}
*/


/*
char **U()
Expand Down Expand Up @@ -594,16 +604,24 @@ class Block : public Fonts
}
*/

/*

char **h()
{
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[10][1] = character[10][18] = character[9][2] = character[9][17] = '\'';

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

return character;
}
*/



char **i()
Expand Down Expand Up @@ -753,17 +771,27 @@ class Block : public Fonts
*/

/*
char **t()

char **t()
{
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[10][1] = character[10][18] = character[9][2] = character[9][17] = '\'';

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

return character;
}

*/


/*
char **u()
Expand Down
19 changes: 9 additions & 10 deletions Fonts/drpepper/drpepper.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,16 @@ character[1][4] = character[2][3] = character[3][4] = '>';
return character;
}

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

return character;
}
*/




Expand Down
2 changes: 1 addition & 1 deletion example.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ int main()
Ascii a = Ascii(block);
a.print("6");
return 0;
}
}
20 changes: 10 additions & 10 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,13 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
<sub><b>pris01</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Odin5133">
<img src="https://avatars.githubusercontent.com/u/96405127?v=4" width="70;" alt="Odin5133"/>
<br />
<sub><b>Odin5133</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/harshvyas-22">
<img src="https://avatars.githubusercontent.com/u/118657807?v=4" width="70;" alt="harshvyas-22"/>
Expand Down Expand Up @@ -581,15 +588,15 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
<br />
<sub><b>AmitRajput1772</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/AryanBakliwal">
<img src="https://avatars.githubusercontent.com/u/106430579?v=4" width="70;" alt="AryanBakliwal"/>
<br />
<sub><b>AryanBakliwal</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/FreemRL">
<img src="https://avatars.githubusercontent.com/u/66525499?v=4" width="70;" alt="FreemRL"/>
Expand All @@ -604,13 +611,6 @@ Features 🎉 Supports a variety of fonts, including standard fonts, decorative
<sub><b>krishna16sharma</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Odin5133">
<img src="https://avatars.githubusercontent.com/u/96405127?v=4" width="70;" alt="Odin5133"/>
<br />
<sub><b>Odin5133</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/rishavr920">
<img src="https://avatars.githubusercontent.com/u/59284650?v=4" width="70;" alt="rishavr920"/>
Expand Down

0 comments on commit fc960cc

Please sign in to comment.