jaildesigner-jailgames/coffee_crisis
1
0
Fork 1
Code Issues Pull Requests Projects Releases 12 Wiki Activity

working on new text engine

Browse Source
This commit is contained in:
Sergio
2021-08-26 18:14:56 +02:00
parent 6d2fd16ec2
commit 3cb822ee6c
11 changed files with 664 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/font/8bithud.txt
View File

@@ -3,7 +3,7 @@
# box height # box height
8 8
# 32 espacio ( ) # 32 espacio ( )
6 2
# 33 ! # 33 !
2 2
# 34 " # 34 "
@@ -185,9 +185,10 @@
# 122 z # 122 z
5 5
# 123 { # 123 {
3
# 124 | # 124 |
2
# 125 } # 125 }
3
# 126 ~ # 126 ~
3

194
media/font/nokia.txt Normal file
View File

@@ -0,0 +1,194 @@
# box width
8
# box height
8
# 32 espacio ( )
2
# 33 !
2
# 34 "
5
# 35 #
6
# 36 $
6
# 37 %
6
# 38 &
6
# 39 '
2
# 40 (
3
# 41 )
3
# 42 *
4
# 43 +
3
# 44 ,
2
# 45 -
3
# 46 .
2
# 47 /
4
# 48 0
6
# 49 1
3
# 50 2
6
# 51 3
6
# 52 4
6
# 53 5
6
# 54 6
6
# 55 7
6
# 56 8
6
# 57 9
6
# 58 :
2
# 59 ;
2
# 60 <
4
# 61 =
3
# 62 >
4
# 63 ?
6
# 64 @
8
# 65 A
6
# 66 B
6
# 67 C
6
# 68 D
6
# 69 E
6
# 70 F
6
# 71 G
6
# 72 H
6
# 73 I
6
# 74 J
6
# 75 K
6
# 76 L
6
# 77 M
6
# 78 N
6
# 79 O
6
# 80 P
6
# 81 Q
6
# 82 R
6
# 83 S
6
# 84 T
6
# 85 U
6
# 86 V
5
# 87 W
6
# 88 X
6
# 89 Y
6
# 90 Z
6
# 91 [
3
# 92 \
5
# 93 ]
3
# 94 ^
4
# 95 _
6
# 96 `
2
# 97 a
5
# 98 b
5
# 99 c
5
# 100 d
5
# 101 e
5
# 102 f
5
# 103 g
5
# 104 h
5
# 105 i
4
# 106 j
5
# 107 k
5
# 108 l
5
# 109 m
6
# 110 n
5
# 111 o
5
# 112 p
5
# 113 q
5
# 114 r
5
# 115 s
5
# 116 t
4
# 117 u
5
# 118 v
5
# 119 w
6
# 120 x
4
# 121 y
4
# 122 z
5
# 123 {
3
# 124 |
2
# 125 }
3
# 126 ~
3

194
media/font/smb2.txt Normal file
View File

@@ -0,0 +1,194 @@
# box width
8
# box height
8
# 32 espacio ( )
2
# 33 !
2
# 34 "
5
# 35 #
6
# 36 $
6
# 37 %
6
# 38 &
6
# 39 '
2
# 40 (
3
# 41 )
3
# 42 *
4
# 43 +
3
# 44 ,
2
# 45 -
3
# 46 .
2
# 47 /
4
# 48 0
6
# 49 1
3
# 50 2
6
# 51 3
6
# 52 4
6
# 53 5
6
# 54 6
6
# 55 7
6
# 56 8
6
# 57 9
6
# 58 :
2
# 59 ;
2
# 60 <
4
# 61 =
3
# 62 >
4
# 63 ?
6
# 64 @
8
# 65 A
6
# 66 B
6
# 67 C
6
# 68 D
6
# 69 E
6
# 70 F
6
# 71 G
6
# 72 H
6
# 73 I
6
# 74 J
6
# 75 K
6
# 76 L
6
# 77 M
6
# 78 N
6
# 79 O
6
# 80 P
6
# 81 Q
6
# 82 R
6
# 83 S
6
# 84 T
6
# 85 U
6
# 86 V
5
# 87 W
6
# 88 X
6
# 89 Y
6
# 90 Z
6
# 91 [
3
# 92 \
5
# 93 ]
3
# 94 ^
4
# 95 _
6
# 96 `
2
# 97 a
5
# 98 b
5
# 99 c
5
# 100 d
5
# 101 e
5
# 102 f
5
# 103 g
5
# 104 h
5
# 105 i
4
# 106 j
5
# 107 k
5
# 108 l
5
# 109 m
6
# 110 n
5
# 111 o
5
# 112 p
5
# 113 q
5
# 114 r
5
# 115 s
5
# 116 t
4
# 117 u
5
# 118 v
5
# 119 w
6
# 120 x
4
# 121 y
4
# 122 z
5
# 123 {
3
# 124 |
2
# 125 }
3
# 126 ~
3

194
media/font/smb2_big.txt Normal file
View File

@@ -0,0 +1,194 @@
# box width
8
# box height
8
# 32 espacio ( )
2
# 33 !
2
# 34 "
5
# 35 #
6
# 36 $
6
# 37 %
6
# 38 &
6
# 39 '
2
# 40 (
3
# 41 )
3
# 42 *
4
# 43 +
3
# 44 ,
2
# 45 -
3
# 46 .
2
# 47 /
4
# 48 0
6
# 49 1
3
# 50 2
6
# 51 3
6
# 52 4
6
# 53 5
6
# 54 6
6
# 55 7
6
# 56 8
6
# 57 9
6
# 58 :
2
# 59 ;
2
# 60 <
4
# 61 =
3
# 62 >
4
# 63 ?
6
# 64 @
8
# 65 A
6
# 66 B
6
# 67 C
6
# 68 D
6
# 69 E
6
# 70 F
6
# 71 G
6
# 72 H
6
# 73 I
6
# 74 J
6
# 75 K
6
# 76 L
6
# 77 M
6
# 78 N
6
# 79 O
6
# 80 P
6
# 81 Q
6
# 82 R
6
# 83 S
6
# 84 T
6
# 85 U
6
# 86 V
5
# 87 W
6
# 88 X
6
# 89 Y
6
# 90 Z
6
# 91 [
3
# 92 \
5
# 93 ]
3
# 94 ^
4
# 95 _
6
# 96 `
2
# 97 a
5
# 98 b
5
# 99 c
5
# 100 d
5
# 101 e
5
# 102 f
5
# 103 g
5
# 104 h
5
# 105 i
4
# 106 j
5
# 107 k
5
# 108 l
5
# 109 m
6
# 110 n
5
# 111 o
5
# 112 p
5
# 113 q
5
# 114 r
5
# 115 s
5
# 116 t
4
# 117 u
5
# 118 v
5
# 119 w
6
# 120 x
4
# 121 y
4
# 122 z
5
# 123 {
3
# 124 |
2
# 125 }
3
# 126 ~
3

2
source/director.cpp
View File

@@ -236,7 +236,9 @@ void Director::setFileList()
mFileList[46] = mExecutablePath + "/" + "../media/font/8bithud.txt"; mFileList[46] = mExecutablePath + "/" + "../media/font/8bithud.txt";
mFileList[28] = mExecutablePath + "/" + "../media/font/nokia.png"; mFileList[28] = mExecutablePath + "/" + "../media/font/nokia.png";
mFileList[29] = mExecutablePath + "/" + "../media/font/smb2_big.png"; mFileList[29] = mExecutablePath + "/" + "../media/font/smb2_big.png";
mFileList[47] = mExecutablePath + "/" + "../media/font/smb2_big.txt";
mFileList[30] = mExecutablePath + "/" + "../media/font/smb2.png"; mFileList[30] = mExecutablePath + "/" + "../media/font/smb2.png";
mFileList[48] = mExecutablePath + "/" + "../media/font/smb2.txt";
} }
// Comprueba que todos los ficheros existen // Comprueba que todos los ficheros existen

74
source/game.cpp
View File

@@ -42,10 +42,12 @@ Game::Game(int numPlayers, SDL_Renderer *renderer, std::string *filelist, std::s
mTexturePlayer2Death = new LTexture(); mTexturePlayer2Death = new LTexture();
mTexturePlayer2Legs = new LTexture(); mTexturePlayer2Legs = new LTexture();
mTextureText = new LTexture(); mTextureText = new LTexture();
mTextureText2 = new LTexture(); mTextureTextScoreBoard = new LTexture();
mTextureTextBig = new LTexture();
mText = new Text(mFileList[46], mTextureText, mRenderer); mText = new Text(mFileList[48], mTextureText, mRenderer);
mTextX2 = new Text(mFileList[46], mTextureText2, mRenderer); mTextScoreBoard = new Text(mFileList[46], mTextureTextScoreBoard, mRenderer);
mTextBig = new Text(mFileList[47], mTextureTextBig, mRenderer);
mMenuGameOver = new Menu(mRenderer, mText, mInput[0], mFileList); mMenuGameOver = new Menu(mRenderer, mText, mInput[0], mFileList);
mMenuPause = new Menu(mRenderer, mText, mInput[0], mFileList); mMenuPause = new Menu(mRenderer, mText, mInput[0], mFileList);
@@ -169,15 +171,22 @@ Game::~Game()
delete mTextureText; delete mTextureText;
mTextureText = nullptr; mTextureText = nullptr;
mTextureText2->unload(); mTextureTextScoreBoard->unload();
delete mTextureText2; delete mTextureTextScoreBoard;
mTextureText2 = nullptr; mTextureTextScoreBoard = nullptr;
mTextureTextBig->unload();
delete mTextureTextBig;
mTextureTextBig = nullptr;
delete mText; delete mText;
mText = nullptr; mText = nullptr;
delete mTextX2; delete mTextScoreBoard;
mTextX2 = nullptr; mTextScoreBoard = nullptr;
delete mTextureTextBig;
mTextureTextBig = nullptr;
delete mMenuGameOver; delete mMenuGameOver;
mMenuGameOver = nullptr; mMenuGameOver = nullptr;
@@ -345,7 +354,8 @@ void Game::init()
// Inicializa los objetos de texto // Inicializa los objetos de texto
mText->init(); mText->init();
mTextX2->init(); mTextScoreBoard->init();
mTextBig->init();
// Inicializa el objeto con el menu de pausa // Inicializa el objeto con el menu de pausa
mMenuPause->init("PAUSE", 0, 12 * BLOCK, MENU_BACKGROUND_SOLID); mMenuPause->init("PAUSE", 0, 12 * BLOCK, MENU_BACKGROUND_SOLID);
@@ -485,8 +495,9 @@ bool Game::loadMedia()
bool success = true; bool success = true;
// Texturas // Texturas
success &= loadTextureFromFile(mTextureText, mFileList[27], mRenderer); success &= loadTextureFromFile(mTextureText, mFileList[30], mRenderer);
success &= loadTextureFromFile(mTextureText2, mFileList[29], mRenderer); success &= loadTextureFromFile(mTextureTextScoreBoard, mFileList[27], mRenderer);
success &= loadTextureFromFile(mTextureTextBig, mFileList[29], mRenderer);
success &= loadTextureFromFile(mTexturePlayer1Legs, mFileList[39], mRenderer); success &= loadTextureFromFile(mTexturePlayer1Legs, mFileList[39], mRenderer);
success &= loadTextureFromFile(mTexturePlayer1Head, mFileList[41], mRenderer); success &= loadTextureFromFile(mTexturePlayer1Head, mFileList[41], mRenderer);
@@ -1581,41 +1592,38 @@ void Game::renderScoreBoard()
mSpritePowerMeter->setSpriteClip(296, 184, (int)percent, 8); mSpritePowerMeter->setSpriteClip(296, 184, (int)percent, 8);
mSpritePowerMeter->render(); mSpritePowerMeter->render();
*/ */
const int offset1 = 163; const int offset1 = 162;
const int offset2 = offset1 + 7; const int offset2 = offset1 + 7;
const int offset3 = offset2 + 7; const int offset3 = offset2 + 7;
const int offset4 = offset3 + 7; const int offset4 = offset3 + 7;
// PLAYER1 - SCORE // PLAYER1 - SCORE
mText->write(PLAY_AREA_LEFT, offset1, mTextStrings[53], 0); mTextScoreBoard->writeCentered(49/2, offset1, mTextStrings[53]);
mText->write(PLAY_AREA_LEFT, offset2, updateScoreText(mPlayer[0]->getScore()), 0); mTextScoreBoard->write(PLAY_AREA_LEFT+1, offset2, updateScoreText(mPlayer[0]->getScore()));
// PLAYER1 - MULT // PLAYER1 - MULT
mText->write(PLAY_AREA_LEFT, offset3, mTextStrings[55], 0); mTextScoreBoard->write(PLAY_AREA_LEFT+1, offset3, mTextStrings[55] + std::to_string(mPlayer[0]->getScoreMultiplier()).substr(0, 3));
mText->write(PLAY_AREA_LEFT + (8 * 7), offset3, std::to_string(mPlayer[0]->getScoreMultiplier()), 0);
if (mNumPlayers == 2) if (mNumPlayers == 2)
{ {
// PLAYER2 - SCORE // PLAYER2 - SCORE
mText->write(PLAY_AREA_RIGHT - (8 * 8), offset1, mTextStrings[54], 0); mTextScoreBoard->writeCentered(PLAY_AREA_RIGHT - (49/2), offset1, mTextStrings[54]);
mText->write(PLAY_AREA_RIGHT - (8 * 7), offset2, updateScoreText(mPlayer[1]->getScore()), 0); mTextScoreBoard->write(PLAY_AREA_RIGHT - 49, offset2, updateScoreText(mPlayer[1]->getScore()));
// PLAYER2 - MULT // PLAYER2 - MULT
mText->write(PLAY_AREA_RIGHT - (8 * 10), offset3, mTextStrings[55], 0); mTextScoreBoard->write(PLAY_AREA_RIGHT - (8 * 10), offset3, mTextStrings[55]+std::to_string(mPlayer[1]->getScoreMultiplier()).substr(0, 3));
mText->write(PLAY_AREA_RIGHT - (8 * 5), offset3, std::to_string(mPlayer[1]->getScoreMultiplier()), 0);
} }
else else
{ {
// PLAYER2 - SCORE // PLAYER2 - SCORE
mText->write(PLAY_AREA_RIGHT - (8 * 9), offset1, mTextStrings[54], 0); mTextScoreBoard->writeCentered(PLAY_AREA_RIGHT - (49/2), offset1, mTextStrings[54]);
mText->write(PLAY_AREA_RIGHT - (8 * 7), offset2, "0000000", 0); mTextScoreBoard->write(PLAY_AREA_RIGHT - 49, offset2, "0000000");
// PLAYER2 - MULT // PLAYER2 - MULT
mText->write(PLAY_AREA_RIGHT - (8 * 10), offset3, mTextStrings[55], 0); mTextScoreBoard->write(PLAY_AREA_RIGHT - (8 * 10), offset3, mTextStrings[55] + "1.0");
mText->write(PLAY_AREA_RIGHT - (8 * 3), offset3, "1.0", 0);
} }
// STAGE // STAGE
mText->writeCentered(PLAY_AREA_CENTER_X, offset1, mTextStrings[42] + std::to_string(mStage[mCurrentStage].number), 0); mTextScoreBoard->writeCentered(PLAY_AREA_CENTER_X, offset1, mTextStrings[57] + std::to_string(mStage[mCurrentStage].number));
// POWER // POWER
//mSpritePowerMeter->setSpriteClip(256, 184, 40, 8); //mSpritePowerMeter->setSpriteClip(256, 184, 40, 8);
@@ -1625,7 +1633,7 @@ void Game::renderScoreBoard()
//mSpritePowerMeter->render(); //mSpritePowerMeter->render();
// HI-SCORE // HI-SCORE
mText->writeCentered(PLAY_AREA_CENTER_X, offset4, mTextStrings[40] + "0000000", 0); mTextScoreBoard->writeCentered(PLAY_AREA_CENTER_X, offset4, mTextStrings[56] + "0000000");
} }
// Actualiza las variables del jugador // Actualiza las variables del jugador
@@ -1804,7 +1812,7 @@ void Game::renderBalloons()
{ {
mBalloon[i]->render(); mBalloon[i]->render();
if ((mDebug.enabled) && (mBalloon[i]->isPopping() == false)) if ((mDebug.enabled) && (mBalloon[i]->isPopping() == false))
mText->writeCentered(mBalloon[i]->getPosX() + (mBalloon[i]->getWidth() / 2), mBalloon[i]->getPosY() - 8, std::to_string(i), 0); mText->writeCentered(mBalloon[i]->getPosX() + (mBalloon[i]->getWidth() / 2), mBalloon[i]->getPosY() - 8, std::to_string(i));
} }
} }
@@ -2893,7 +2901,7 @@ void Game::renderMessages()
{ {
if ((mTimeStoppedCounter > 100) || (mTimeStoppedCounter % 10 > 4)) if ((mTimeStoppedCounter > 100) || (mTimeStoppedCounter % 10 > 4))
//mText->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, "Time Stopped: " + std::to_string(mTimeStoppedCounter / 10)); //mText->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, "Time Stopped: " + std::to_string(mTimeStoppedCounter / 10));
mText->writeDX(TXT_CENTER | TXT_SHADOW, PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, mTextStrings[36] + std::to_string(mTimeStoppedCounter / 10), 0, noColor, 1, shdwTxtColor); mText->writeDX(TXT_CENTER | TXT_SHADOW, PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, mTextStrings[36] + std::to_string(mTimeStoppedCounter / 10), 1, noColor, 1, shdwTxtColor);
if (mTimeStoppedCounter > 100) if (mTimeStoppedCounter > 100)
{ {
@@ -2910,7 +2918,7 @@ void Game::renderMessages()
// D E M O // D E M O
if (mDemo.enabled) if (mDemo.enabled)
if (mDemo.counter % 30 > 14) if (mDemo.counter % 30 > 14)
mTextX2->writeDX(TXT_CENTER | TXT_SHADOW, PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, mTextStrings[37], 0, noColor, 2, shdwTxtColor); mTextBig->writeDX(TXT_CENTER | TXT_SHADOW, PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, mTextStrings[37], 0, noColor, 2, shdwTxtColor);
// STAGE NUMBER // STAGE NUMBER
std::string text = mTextStrings[38] + std::to_string(mStage[mCurrentStage].number); std::string text = mTextStrings[38] + std::to_string(mStage[mCurrentStage].number);
@@ -2918,7 +2926,7 @@ void Game::renderMessages()
text = mTextStrings[50]; text = mTextStrings[50];
if (mStageBitmapCounter < STAGE_COUNTER) if (mStageBitmapCounter < STAGE_COUNTER)
mTextX2->writeDX(TXT_CENTER | TXT_SHADOW, PLAY_AREA_CENTER_X, mStageBitmapPath[mStageBitmapCounter], text, 0, noColor, 2, shdwTxtColor); mTextBig->writeDX(TXT_CENTER | TXT_SHADOW, PLAY_AREA_CENTER_X, mStageBitmapPath[mStageBitmapCounter], text, 1, noColor, 2, shdwTxtColor);
} }
// Habilita el efecto del item de detener el tiempo // Habilita el efecto del item de detener el tiempo
@@ -3243,9 +3251,9 @@ void Game::runGameOverScreen()
SDL_RenderClear(mRenderer); SDL_RenderClear(mRenderer);
// Dibuja los objetos // Dibuja los objetos
mTextX2->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y - (BLOCK * 4), mTextStrings[43], 0); mTextBig->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y - (BLOCK * 4), mTextStrings[43]);
mText->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y - (BLOCK * 1), mTextStrings[44] + std::to_string(mPlayer[0]->getScore()), 0); mText->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y - (BLOCK * 1), mTextStrings[44] + std::to_string(mPlayer[0]->getScore()));
mText->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y + BLOCK * 2, mTextStrings[45], 0); mText->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y + BLOCK * 2, mTextStrings[45]);
mMenuGameOver->render(); mMenuGameOver->render();
mFade->render(); mFade->render();

12
source/game.h
View File

@@ -85,7 +85,7 @@ private:
int mNumPlayers; // Numero de jugadores int mNumPlayers; // Numero de jugadores
Player *mPlayer[2]; // Vector con los jugadores jugador Player *mPlayer[2]; // Vector con los jugadores jugador
Input *mInput[2]; // Manejador de entrada, uno por cada jugador Input *mInput[2]; // Manejador de entrada, uno por cada jugador
Balloon *mBalloon[MAX_BALLOONS]; // Vector con los objetos globo Balloon *mBalloon[MAX_BALLOONS]; // Vector con los objetos globo
Bullet *mBullet[MAX_BULLETS]; // Vector con los objetos bala Bullet *mBullet[MAX_BULLETS]; // Vector con los objetos bala
@@ -105,11 +105,13 @@ private:
LTexture *mTexturePlayer2Body; // Textura para el cuerpo del jugador2 LTexture *mTexturePlayer2Body; // Textura para el cuerpo del jugador2
LTexture *mTexturePlayer2Death; // Textura para la animación de muerte del jugador2 LTexture *mTexturePlayer2Death; // Textura para la animación de muerte del jugador2
LTexture *mTexturePlayer2Legs; // Textura para las piernas del jugador LTexture *mTexturePlayer2Legs; // Textura para las piernas del jugador
LTexture *mTextureText; // Textura para el texto LTexture *mTextureText; // Textura para el texto del juego
LTexture *mTextureText2; // Textura para el texto LTexture *mTextureTextScoreBoard; // Textura para el texto del marcador
LTexture *mTextureTextBig; // Textura para el texto grande
Text *mText; // Variable con todos los objetos de texto Text *mText; // Fuente para los textos del juego
Text *mTextX2; // Variable con todos los objetos de texto Text *mTextScoreBoard; // Fuente para el marcador del juego
Text *mTextBig; // Fuente de texto grande
Menu *mMenuGameOver; // Menú de la pantalla de game over Menu *mMenuGameOver; // Menú de la pantalla de game over
Menu *mMenuPause; // Menú de la pantalla de pausa Menu *mMenuPause; // Menú de la pantalla de pausa

13
source/lang.h
View File

@@ -282,26 +282,31 @@ const std::string gTextStrings[MAX_TEXT_STRINGS][3] =
// MARCADOR // MARCADOR
// 53 - MENU DEL TITULO (2 JUGADORES) // 53 - JUGADOR 1
{"jugador 1", {"jugador 1",
"jugador 2", "jugador 2",
"player 1"}, "player 1"},
// 54 - MENU DEL TITULO (2 JUGADORES) // 54 - JUGADOR 2
{"jugador 2", {"jugador 2",
"jugador 2", "jugador 2",
"player 2"}, "player 2"},
// 55 - MENU DEL TITULO (2 JUGADORES) // 55 - MULTIPLICADOR
{"mult - ", {"mult - ",
"mult - ", "mult - ",
"mult - "}, "mult - "},
// 56 - MENU DEL TITULO (2 JUGADORES) // 56 - MAXIMA PUNTUACION
{"max. puntuacion - ", {"max. puntuacion - ",
"max. puntuacio - ", "max. puntuacio - ",
"high score - "}, "high score - "},
// 57 - FASE
{"fase ",
"nivell ",
"stage "},
}; };
void initTextStrings(std::string *textStrings, Uint8 lang); void initTextStrings(std::string *textStrings, Uint8 lang);

8
source/menu.cpp
View File

@@ -291,7 +291,7 @@ void Menu::render()
} }
else else
{ {
mText->write(mItem[i].x, mItem[i].y, mItem[i].label, 0); mText->write(mItem[i].x, mItem[i].y, mItem[i].label);
} }
} }
} }
@@ -417,7 +417,7 @@ void Menu::addItem(std::string text, const Uint8 hPaddingUp, const Uint8 hPaddin
if (mTotalItems == 0) if (mTotalItems == 0)
{ {
mItem[mTotalItems].label = text; mItem[mTotalItems].label = text;
mItem[mTotalItems].w = mText->lenght(mItem[mTotalItems].label, 0); mItem[mTotalItems].w = mText->lenght(mItem[mTotalItems].label);
mItem[mTotalItems].h = mText->getCharacterWidth() + (mVerticalPadding * 2); mItem[mTotalItems].h = mText->getCharacterWidth() + (mVerticalPadding * 2);
mItem[mTotalItems].x = mPosX; mItem[mTotalItems].x = mPosX;
mItem[mTotalItems].y = mPosY; mItem[mTotalItems].y = mPosY;
@@ -430,7 +430,7 @@ void Menu::addItem(std::string text, const Uint8 hPaddingUp, const Uint8 hPaddin
if (mTotalItems < 10) if (mTotalItems < 10)
{ {
mItem[mTotalItems].label = text; mItem[mTotalItems].label = text;
mItem[mTotalItems].w = mText->lenght(mItem[mTotalItems].label, 0); mItem[mTotalItems].w = mText->lenght(mItem[mTotalItems].label);
mItem[mTotalItems].h = mText->getCharacterWidth() + (mVerticalPadding * 2); mItem[mTotalItems].h = mText->getCharacterWidth() + (mVerticalPadding * 2);
mItem[mTotalItems].x = mPosX; mItem[mTotalItems].x = mPosX;
mItem[mTotalItems].y = mItem[mTotalItems - 1].y + mItem[mTotalItems - 1].h + mItem[mTotalItems - 1].hPaddingDown; mItem[mTotalItems].y = mItem[mTotalItems - 1].y + mItem[mTotalItems - 1].h + mItem[mTotalItems - 1].hPaddingDown;
@@ -447,7 +447,7 @@ void Menu::addItem(std::string text, const Uint8 hPaddingUp, const Uint8 hPaddin
void Menu::setItemCaption(Uint8 index, std::string text) void Menu::setItemCaption(Uint8 index, std::string text)
{ {
mItem[index].label = text; mItem[index].label = text;
mItem[index].w = mText->lenght(mItem[index].label, 0); mItem[index].w = mText->lenght(mItem[index].label);
reorganize(); reorganize();
} }

10
source/text.cpp
View File

@@ -49,8 +49,8 @@ void Text::init()
// Establece las coordenadas para cada caracter ascii de la cadena y su ancho // Establece las coordenadas para cada caracter ascii de la cadena y su ancho
for (int i = 32; i < 128; i++) for (int i = 32; i < 128; i++)
{ {
mOffset[i].x = ((i - 32) % 16) * mBoxWidth; mOffset[i].x = ((i - 32) % 15) * mBoxWidth;
mOffset[i].y = ((i - 32) / 16) * mBoxHeight; mOffset[i].y = ((i - 32) / 15) * mBoxHeight;
} }
} }
@@ -138,10 +138,12 @@ void Text::initOffsetFromFile()
std::getline(rfile, buffer); std::getline(rfile, buffer);
std::getline(rfile, buffer); std::getline(rfile, buffer);
mBoxWidth = std::stoi(buffer); mBoxWidth = std::stoi(buffer);
//printf("mBoxWidth: %i\n", mBoxWidth);
std::getline(rfile, buffer); std::getline(rfile, buffer);
std::getline(rfile, buffer); std::getline(rfile, buffer);
mBoxHeight = std::stoi(buffer); mBoxHeight = std::stoi(buffer);
//printf("mBoxHeight: %i\n", mBoxHeight);
// lee el resto de datos del fichero // lee el resto de datos del fichero
int index = 32; int index = 32;
@@ -150,8 +152,10 @@ void Text::initOffsetFromFile()
{ {
// Almacena solo las lineas impares // Almacena solo las lineas impares
if (line_read % 2 == 1) if (line_read % 2 == 1)
{
//printf("%i - %i - %s\n", line_read, index, buffer.c_str());
mOffset[index++].w = std::stoi(buffer); mOffset[index++].w = std::stoi(buffer);
}
//Then clear the buffer once you're done with it. //Then clear the buffer once you're done with it.
buffer.clear(); buffer.clear();
line_read++; line_read++;

12
source/text.h
View File

@@ -41,22 +41,22 @@ public:
void init(); void init();
// Escribe el texto en pantalla // Escribe el texto en pantalla
void write(int x, int y, std::string text, int kerning = 0, int lenght = -1); void write(int x, int y, std::string text, int kerning = 1, int lenght = -1);
// Escribe el texto con colores // Escribe el texto con colores
void writeColored(int x, int y, std::string text, color_t color, int kerning = 0, int lenght = -1); void writeColored(int x, int y, std::string text, color_t color, int kerning = 1, int lenght = -1);
// Escribe el texto con sombra // Escribe el texto con sombra
void writeShadowed(int x, int y, std::string text, color_t color, Uint8 shadowDistance = 1, int kerning = 0, int lenght = -1); void writeShadowed(int x, int y, std::string text, color_t color, Uint8 shadowDistance = 1, int kerning = 1, int lenght = -1);
// Escribe el texto centrado en un punto x y con kerning // Escribe el texto centrado en un punto x y con kerning
void writeCentered(int x, int y, std::string text, int kerning = 0, int lenght = -1); void writeCentered(int x, int y, std::string text, int kerning = 1, int lenght = -1);
// Escribe texto con extras // Escribe texto con extras
void writeDX(Uint8 flags, int x, int y, std::string text, int kerning = 0, color_t textColor = {255, 255, 255}, Uint8 shadowDistance = 1, color_t shadowColor = {0, 0, 0}, int lenght = -1); void writeDX(Uint8 flags, int x, int y, std::string text, int kerning = 1, color_t textColor = {255, 255, 255}, Uint8 shadowDistance = 1, color_t shadowColor = {0, 0, 0}, int lenght = -1);
// Obtiene la longitud en pixels de una cadena // Obtiene la longitud en pixels de una cadena
Uint16 lenght(std::string text, int kerning); Uint16 lenght(std::string text, int kerning = 1);
// Devuelve el valor de la variable // Devuelve el valor de la variable
Uint8 getCharacterWidth(); Uint8 getCharacterWidth();