print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CrashOveride95/ultrasm64

Browse Source
This commit is contained in:
Reonu
2021-07-16 02:48:49 +01:00
parent 5ff7236847 0b91eeb6e6
commit d11488b1a0
9 changed files with 60 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tools/skyconv.c
View File

@@ -118,15 +118,18 @@ static void split_tile(int col, int row, rgba *image, bool expanded) {
for (int x = 0; x < tileWidth; x++) {
int ny = row * tileHeight + y;
int nx = col * tileWidth + x;
if (nx < imageWidth && ny < imageHeight)
{
if(type == CakeEU) {
tiles[row * numCols + col].px[y * expandedWidth + x] = image[(ny * imageWidth + nx)];
} else {
if (nx < imageWidth && ny < imageHeight)
{
tiles[row * numCols + col].px[y * expandedWidth + x] = image[(ny * imageWidth + nx)];
}
else
{
tiles[row * numCols + col].px[y * expandedWidth + x] = black;
}
}
else
{
tiles[row * numCols + col].px[y * expandedWidth + x] = black;
}
}
}
}
@@ -345,19 +348,24 @@ static void write_cake_c() {
FILE *cFile = fopen(buffer, "w");
const char *euSuffx = "";
int numTiles = TABLE_DIMENSIONS[type].cols * TABLE_DIMENSIONS[type].rows;
if (type == CakeEU) {
euSuffx = "eu_";
for (int i = 0; i < numTiles; ++i) {
fprintf(cFile, "ALIGNED8 static const Texture cake_end_texture_eu_%d[] = {\n", i);
print_raw_data(cFile, &tiles[i]);
fputs("};\n\n", cFile);
}
} else {
fprintf(cFile, "ALIGNED8 static const u8 cake_end_texture_data[] = {\n");
for (int i = 0; i < numTiles; ++i) {
print_raw_data(cFile, &tiles[i]);
fputc(',', cFile);
fputc('\n', cFile);
}
fputs("};\n\n", cFile);
}
int numTiles = TABLE_DIMENSIONS[type].cols * TABLE_DIMENSIONS[type].rows;
fprintf(cFile, "ALIGNED8 static const Texture cake_end_texture_%sdata[] = {\n", euSuffx);
for (int i = 0; i < numTiles; ++i) {
print_raw_data(cFile, &tiles[i]);
fputc(',', cFile);
fputc('\n', cFile);
}
fputs("};\n\n", cFile);
fclose(cFile);
}
@@ -669,4 +677,4 @@ int main(int argc, char *argv[]) {
return EXIT_SUCCESS;
}
}