nacabaro/nacapet
1
0
Fork 0
mirror of https://github.com/nacabaro/nacapet.git synced 2026-06-05 14:02:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix egg upscale issues

Browse Source
This commit is contained in:
Nacho 2026-05-28 19:32:04 +02:00
parent 24ebd8a5af
commit f8f7c7a9b6
2 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vpet/lines/get_available_lines.cpp
View File

@ -83,8 +83,8 @@ void lines_getAvailableLines() {
uint8_t lowByte; uint8_t lowByte;
for (int i = 0; i < originalWidth * originalHeight; i++) { for (int i = 0; i < originalWidth * originalHeight; i++) {
bytesRead += lineFile.read(&highByte, 1);
bytesRead += lineFile.read(&lowByte, 1); bytesRead += lineFile.read(&lowByte, 1);
bytesRead += lineFile.read(&highByte, 1);
spriteBuffer[i] = (highByte << 8) | lowByte; spriteBuffer[i] = (highByte << 8) | lowByte;
} }

72
src/vpet/lines/get_single_line.cpp
View File

@ -1,6 +1,7 @@
#include "lines.h" #include "lines.h"
#include "memory/memory.h" #include "memory/memory.h"
#include "defs/defs.h" #include "defs/defs.h"
#include "utils/utils.h"
#include <FS.h> #include <FS.h>
#include <SPIFFS.h> #include <SPIFFS.h>
@ -40,37 +41,76 @@ void lines_getSingleLine(const char* fileName) {
currentLine[currentCharacter] = selectedLine; currentLine[currentCharacter] = selectedLine;
currentEgg = selectedEgg; currentEgg = selectedEgg;
} }
void lines_getSingleEggSprites(fs::File &lineFile, Egg_t* selectedEgg) { void lines_getSingleEggSprites(fs::File &lineFile, Egg_t* selectedEgg) {
// Importante tener el nombre de archivo del huevo en todo momento // Importante tener el nombre de archivo del huevo en todo momento
strcpy(selectedEgg->fileName, lineFile.name()); strcpy(selectedEgg->fileName, lineFile.name());
// Ahora se lee los datos // Leer dimensiones originales
lineFile.read(&(selectedEgg->eggSprite.spriteWidth), 1); uint8_t originalWidth;
lineFile.read(&(selectedEgg->eggSprite.spriteHeight), 1); uint8_t originalHeight;
lineFile.read(&originalWidth, 1);
lineFile.read(&originalHeight, 1);
lineFile.read(&(selectedEgg->eggSprite.spriteNumber), 1); lineFile.read(&(selectedEgg->eggSprite.spriteNumber), 1);
const uint8_t scaledWidth = originalWidth * SPRITE_SCALE;
const uint8_t scaledHeight = originalHeight * SPRITE_SCALE;
// Guardar dimensiones escaladas
selectedEgg->eggSprite.spriteWidth = scaledWidth;
selectedEgg->eggSprite.spriteHeight = scaledHeight;
// Reservar memoria para sprites escalados
selectedEgg->eggSprite.spriteData = memory_allocate( selectedEgg->eggSprite.spriteData = memory_allocate(
selectedEgg->eggSprite.spriteNumber, selectedEgg->eggSprite.spriteNumber,
selectedEgg->eggSprite.spriteWidth, scaledWidth,
selectedEgg->eggSprite.spriteHeight scaledHeight
); );
uint16_t size = selectedEgg->eggSprite.spriteWidth * selectedEgg->eggSprite.spriteHeight; const uint16_t originalSize =
originalWidth * originalHeight;
// Buffer temporal en SRAM
uint16_t* spriteBuffer =
(uint16_t*) malloc(
originalSize * sizeof(uint16_t)
);
if (!spriteBuffer) {
printf("[LINES] Failed to allocate sprite buffer\n");
return;
}
uint8_t highByte; uint8_t highByte;
uint8_t lowByte; uint8_t lowByte;
for (int spr = 0; spr < selectedEgg->eggSprite.spriteNumber; spr++) { for (
for (int i= 0; i < size; i++) { int spr = 0;
lineFile.read(&highByte, 1); spr < selectedEgg->eggSprite.spriteNumber;
spr++
) {
// Leer sprite original
for (int i = 0; i < originalSize; i++) {
lineFile.read(&lowByte, 1); lineFile.read(&lowByte, 1);
lineFile.read(&highByte, 1);
uint16_t pixel = (highByte << 8) | lowByte; spriteBuffer[i] =
(highByte << 8) | lowByte;
selectedEgg->eggSprite.spriteData[spr][i] = pixel;
} }
}
// Escalar sprite
utils_upscaleSprite(
spriteBuffer,
originalWidth,
originalHeight,
selectedEgg->eggSprite.spriteData[spr]
);
}
free(spriteBuffer);
} }
// Son las 22:35, que estoy haciendo? // Son las 22:35, que estoy haciendo?