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 19d5862 + 1fcf8cc commit 47d42c8
Show file tree
Hide file tree
Showing 5 changed files with 133 additions and 80 deletions.
23 changes: 11 additions & 12 deletions Fonts/amongus/amongus.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ class Amongus : public Fonts
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]=')';




return character;
}

Expand All @@ -121,16 +117,16 @@ class Amongus : public Fonts
}


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

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

/*
char **I()
Expand All @@ -143,16 +139,19 @@ class Amongus : public Fonts
}
*/

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

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


char **K()
Expand Down
85 changes: 72 additions & 13 deletions Fonts/block/block.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,59 @@ class Block : public Fonts
}


/*

char **C()
{
char **character = getCharGrid();

//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[10][1] =character[9][2]=character[9][17]= character[10][18] = '\'';

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


return character;
}
*/



/*
char **D()
{
char **character = getCharGrid();

//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[10][1] =character[9][2]=character[9][17]= character[10][18] = '\'';

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[3][5]=character[3][9]=character[3][10]=character[3][11]= character[7][5]=character[7][6]=character[7][7]=character[7][8]=character[7][9]=character[7][10]=character[7][11]=character[7][12]=character[6][5]=character[6][9]=character[6][10]=character[6][11]='_';
character[3][4]=character[4][6]=character[4][8]=character[5][6]=character[5][8]=character[5][13]=character[5][15]=character[6][6]=character[6][8]=character[7][4]='|';
character[3][14]= character[4][13]=character[6][12]=character[7][13]='.';
character[4][15]='\\';
character[6][15]='/';
character[6][13]= character[7][14]='\'';
character[3][13]= character[4][12]='`';


return character;
}
*/



char **E()
Expand Down Expand Up @@ -149,7 +181,7 @@ class Block : public Fonts
char **character = getCharGrid();

//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[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] = '|';
Expand Down Expand Up @@ -295,16 +327,34 @@ class Block : public Fonts
}


/*

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

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


return character;
}
*/


char **R()
{
Expand Down Expand Up @@ -555,17 +605,26 @@ class Block : public Fonts
}
*/

/*

char **i()
{
char **character = getCharGrid();
char **character = getCharGrid();

//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[10][1] =character[9][2]=character[9][17]= character[10][18] = '\'';

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

return character;
}

*/


char **j()
{
Expand Down
62 changes: 33 additions & 29 deletions Fonts/drpepper/drpepper.h
Original file line number Diff line number Diff line change
Expand Up @@ -669,17 +669,20 @@ character[2][0] = character[2][2] = character[3][0] = character[3][2] = '|';
*/

/*

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

return character;
}

*/



char **four()
Expand Down Expand Up @@ -718,29 +721,30 @@ character[2][0] = character[2][2] = character[3][0] = character[3][2] = '|';
*/

/*
char **seven()
{
char **character = getCharGrid(rows,cols);
//Enter the character grid in ROWS X COLS
return character;
}
*/

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

return character;
}
char **eight()
{
char **character = getCharGrid(4, 5);
character[0][0] = character[0][4] = character[1][1] = character[1][3] = character[2][1] = character[2][3] = ' ';
character[0][1] = character[0][2] = character[0][3] = character[3][1] = character[3][2] = character[3][3] = '_';
character[1][0] = '<';
character[1][2] = character[2][2] = '.';
character[1][4] = '>';
character[2][0] = character[3][4] = '/';
character[2][4] = character[3][0] = '\\';
return character;
}

*/


/*
char **nine()
Expand Down
4 changes: 2 additions & 2 deletions 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(drpepper);
a.print("t");
Ascii a = Ascii(amongus);
a.print("H");
return 0;
}
Loading

0 comments on commit 47d42c8

Please sign in to comment.