Actualizadas las librerias comunes

This commit is contained in:
2022-12-05 09:55:15 +01:00
parent 09a205a288
commit a32582f1ec
11 changed files with 86 additions and 74 deletions

View File

@@ -383,9 +383,9 @@ void Screen::renderNotifications()
return;
}
//SDL_RenderSetLogicalSize(renderer, notificationLogicalWidth, notificationLogicalHeight);
SDL_RenderSetLogicalSize(renderer, notificationLogicalWidth, notificationLogicalHeight);
notify->render();
//SDL_RenderSetLogicalSize(renderer, windowWidth, windowHeight);
SDL_RenderSetLogicalSize(renderer, windowWidth, windowHeight);
}
// Establece el tamaño de las notificaciones

View File

@@ -95,6 +95,9 @@ Text::Text(std::string bitmapFile, std::string textFile, SDL_Renderer *renderer)
// Crea los objetos
texture = new Texture(renderer, bitmapFile);
sprite = new Sprite({0, 0, boxWidth, boxHeight}, texture, renderer);
// Inicializa variables
fixedWidth = false;
}
// Constructor
@@ -114,6 +117,7 @@ Text::Text(std::string textFile, Texture *texture, SDL_Renderer *renderer)
}
// Crea los objetos
this->texture = nullptr;
sprite = new Sprite({0, 0, boxWidth, boxHeight}, texture, renderer);
// Inicializa variables
@@ -134,6 +138,7 @@ Text::Text(textFile_t *textFile, Texture *texture, SDL_Renderer *renderer)
}
// Crea los objetos
this->texture = nullptr;
sprite = new Sprite({0, 0, boxWidth, boxHeight}, texture, renderer);
// Inicializa variables
@@ -144,7 +149,7 @@ Text::Text(textFile_t *textFile, Texture *texture, SDL_Renderer *renderer)
Text::~Text()
{
delete sprite;
if (texture)
if (texture != nullptr)
{
delete texture;
}
@@ -156,15 +161,19 @@ void Text::write(int x, int y, std::string text, int kerning, int lenght)
int shift = 0;
if (lenght == -1)
{
lenght = text.length();
}
sprite->setPosY(y);
const int width = sprite->getWidth();
const int height = sprite->getHeight();
for (int i = 0; i < lenght; ++i)
{
sprite->setSpriteClip(offset[int(text[i])].x, offset[int(text[i])].y, sprite->getWidth(), sprite->getHeight());
const int index = text[i];
sprite->setSpriteClip(offset[index].x, offset[index].y, width, height);
sprite->setPosX(x + shift);
sprite->setPosY(y);
sprite->render();
// shift += (offset[int(text[i])].w + kerning);
shift += fixedWidth ? boxWidth : (offset[int(text[i])].w + kerning);
}
}

View File

@@ -92,7 +92,8 @@ bool Texture::loadFromFile(std::string path, SDL_Renderer *renderer)
SDL_FreeSurface(loadedSurface);
}
// Return success
// Devuelve el resultado
stbi_image_free(data);
texture = newTexture;
return texture != nullptr;
}