jailers/jaildoctors_dilemma
5
0
Fork 0
forked from jaildesigner-jailgames/jaildoctors_dilemma
Code Pull Requests Activity

Afegint smart pointers

Browse Source 
Actualitzat Resources
Actualitzades les classes Sprite i derivades
Afegida nova tipografia
Actualitzat Asset
Actualitzat Text
This commit is contained in:
Sergio
2025-02-24 14:09:29 +01:00
parent 48971cd5d1
commit e6f101ece6
42 changed files with 2669 additions and 3158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
source/ending.cpp
View File

@@ -13,7 +13,7 @@
#include "resource.h" // Para Resource
#include "screen.h" // Para Screen
#include "sprite.h" // Para Sprite
#include "text.h" // Para Text, TXT_STROKE
#include "text.h" // Para Text, TEXT_STROKE
#include "texture.h" // Para Texture
#include "utils.h" // Para color_t, stringToColor, options_t
#include "options.h"
@@ -29,8 +29,8 @@ Ending::Ending()
input(Input::get())
{
// Reserva memoria para los punteros a objetos
text = new Text(resource->getOffset("smb2.txt"), resource->getTexture("smb2.png"), renderer);
music = JA_LoadMusic(asset->get("ending1.ogg").c_str());
text = resource->getText("smb2.txt");
music = resource->getMusic("ending1.ogg");
// Inicializa variables
counter = -1;
@@ -73,27 +73,7 @@ Ending::Ending()
Ending::~Ending()
{
// Libera la memoria de los objetos
delete text;
SDL_DestroyTexture(coverTexture);
for (auto st : spriteTexts)
{
delete st.sprite;
delete st.texture;
delete st.coverSprite;
delete st.coverTexture;
}
spriteTexts.clear();
for (auto sp : spritePics)
{
delete sp.sprite;
delete sp.coverSprite;
delete sp.coverTexture;
}
spritePics.clear();
JA_DeleteMusic(music);
}
// Actualiza el objeto
@@ -206,13 +186,6 @@ void Ending::iniTexts()
texts.push_back({"WERE BORN...", 158});
// Crea los sprites
for (auto st : spriteTexts)
{
delete st.sprite;
delete st.texture;
delete st.coverSprite;
delete st.coverTexture;
}
spriteTexts.clear();
for (auto t : texts)
@@ -223,19 +196,19 @@ void Ending::iniTexts()
Color c = stringToColor(options.video.palette, "black");
// Crea la texture
st.texture = new Texture(renderer);
st.texture->createBlank(renderer, width, height, SDL_TEXTUREACCESS_TARGET);
st.texture = std::make_shared<Texture>(renderer);
st.texture->createBlank(width, height);
st.texture->setAsRenderTarget(renderer);
st.texture->setBlendMode(SDL_BLENDMODE_BLEND);
text->writeDX(TXT_STROKE, 2, 2, t.caption, 1, c, 2, c);
text->writeDX(TEXT_STROKE, 2, 2, t.caption, 1, c, 2, c);
// Crea el sprite
st.sprite = new Sprite({0, 0, st.texture->getWidth(), st.texture->getHeight()}, st.texture, renderer);
st.sprite->setPos({(GAMECANVAS_WIDTH - st.texture->getWidth()) / 2, t.pos});
st.sprite = std::make_shared<Sprite>(st.texture, 0, 0, st.texture->getWidth(), st.texture->getHeight());
st.sprite->setPosition((GAMECANVAS_WIDTH - st.texture->getWidth()) / 2, t.pos);
// Crea la coverTexture
st.coverTexture = new Texture(renderer);
st.coverTexture->createBlank(renderer, width, height + 8, SDL_TEXTUREACCESS_TARGET);
st.coverTexture = std::make_shared<Texture>(renderer);
st.coverTexture->createBlank(width, height + 8);
st.coverTexture->setAsRenderTarget(renderer);
st.coverTexture->setBlendMode(SDL_BLENDMODE_BLEND);
@@ -264,8 +237,8 @@ void Ending::iniTexts()
SDL_RenderFillRect(renderer, &rect);
// Crea el sprite
st.coverSprite = new Sprite({0, 0, st.coverTexture->getWidth(), st.coverTexture->getHeight() - 8}, st.coverTexture, renderer);
st.coverSprite->setPos({(GAMECANVAS_WIDTH - st.coverTexture->getWidth()) / 2, t.pos});
st.coverSprite = std::make_shared<Sprite>(st.coverTexture, 0, 0, st.coverTexture->getWidth(), st.coverTexture->getHeight() - 8);
st.coverSprite->setPosition((GAMECANVAS_WIDTH - st.coverTexture->getWidth()) / 2, t.pos);
st.coverSprite->setClip(0, 8, -1, -1);
// Inicializa variables
@@ -300,12 +273,6 @@ void Ending::iniPics()
}
// Crea los sprites
for (auto sp : spritePics)
{
delete sp.sprite;
delete sp.coverSprite;
delete sp.coverTexture;
}
spritePics.clear();
for (auto p : pics)
@@ -318,12 +285,12 @@ void Ending::iniPics()
const int height = sp.texture->getHeight();
// Crea el sprite
sp.sprite = new Sprite({0, 0, width, height}, sp.texture, renderer);
sp.sprite->setPos({(GAMECANVAS_WIDTH - width) / 2, p.pos});
sp.sprite = std::make_shared<Sprite>(sp.texture, 0, 0, width, height);
sp.sprite->setPosition((GAMECANVAS_WIDTH - width) / 2, p.pos);
// Crea la coverTexture
sp.coverTexture = new Texture(renderer);
sp.coverTexture->createBlank(renderer, width, height + 8, SDL_TEXTUREACCESS_TARGET);
sp.coverTexture = std::make_shared<Texture>(renderer);
sp.coverTexture->createBlank(width, height + 8);
sp.coverTexture->setAsRenderTarget(renderer);
sp.coverTexture->setBlendMode(SDL_BLENDMODE_BLEND);
@@ -352,8 +319,8 @@ void Ending::iniPics()
SDL_RenderFillRect(renderer, &rect);
// Crea el sprite
sp.coverSprite = new Sprite({0, 0, sp.coverTexture->getWidth(), sp.coverTexture->getHeight() - 8}, sp.coverTexture, renderer);
sp.coverSprite->setPos({(GAMECANVAS_WIDTH - sp.coverTexture->getWidth()) / 2, p.pos});
sp.coverSprite = std::make_shared<Sprite>(sp.coverTexture, 0, 0, sp.coverTexture->getWidth(), sp.coverTexture->getHeight() - 8);
sp.coverSprite->setPosition((GAMECANVAS_WIDTH - sp.coverTexture->getWidth()) / 2, p.pos);
sp.coverSprite->setClip(0, 8, -1, -1);
// Inicializa variables
@@ -498,7 +465,7 @@ void Ending::updateSpriteCovers()
else if (spriteTexts[ti.index].clipHeight > 0)
{
spriteTexts[ti.index].clipHeight -= 2;
spriteTexts[ti.index].coverSprite->setPosY(spriteTexts[ti.index].coverSprite->getPosY() + 2);
spriteTexts[ti.index].coverSprite->setY(spriteTexts[ti.index].coverSprite->getY() + 2);
}
spriteTexts[ti.index].coverSprite->setClip(0, spriteTexts[ti.index].clipDesp, spriteTexts[ti.index].coverSprite->getWidth(), spriteTexts[ti.index].clipHeight);
}
@@ -519,7 +486,7 @@ void Ending::updateSpriteCovers()
{
spritePics[scene].clipHeight = 0;
}
spritePics[scene].coverSprite->setPosY(spritePics[scene].coverSprite->getPosY() + 2);
spritePics[scene].coverSprite->setY(spritePics[scene].coverSprite->getY() + 2);
}
spritePics[scene].coverSprite->setClip(0, spritePics[scene].clipDesp, spritePics[scene].coverSprite->getWidth(), spritePics[scene].clipHeight);
}