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

Added support for bigger skybox sizes

Browse Source
This commit is contained in:
MineQwerty
2021-07-11 20:02:12 -04:00
parent c9aa4c8fbd
commit fe8243ef14
6 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/Makefile
View File

@@ -5,7 +5,7 @@ HOST_ENV := $(patsubst MINGW%,MinGW,$(HOST_ENV))
CC := gcc
CXX := g++
CFLAGS := -I. -O2 -s
CFLAGS := -I. -g -s
LDFLAGS := -lm
ALL_PROGRAMS := armips filesizer rncpack n64graphics n64graphics_ci mio0 slienc n64cksum textconv patch_libultra_math aifc_decode aiff_extract_codebook vadpcm_enc tabledesign extract_data_for_mio skyconv
LIBAUDIOFILE := audiofile/libaudiofile.a
@@ -56,6 +56,7 @@ vadpcm_enc_CFLAGS := -Wno-unused-result -Wno-uninitialized -Wno-sign-compare -W
extract_data_for_mio_SOURCES := extract_data_for_mio.c
skyconv_SOURCES := skyconv.c n64graphics.c utils.c
skyconv_CFLAGS := -g -I../include
armips: CC := $(CXX)
armips_SOURCES := armips.cpp

14
tools/skyconv.c
View File

@@ -12,6 +12,7 @@
#include "n64graphics.h"
#include "utils.h"
#include "config.h"
#define SKYCONV_ENCODING ENCODING_U8
@@ -45,8 +46,8 @@ typedef struct {
static const ImageProps IMAGE_PROPERTIES[ImageType_MAX][2] = {
[Skybox] = {
{248, 248, 31, 31, 8, 8, true, true},
{256, 256, 32, 32, 8, 8, true, true},
{(248 * SKYBOX_SIZE), (248 * SKYBOX_SIZE), 31, 31, (8 * SKYBOX_SIZE), (8 * SKYBOX_SIZE), true, true},
{(256 * SKYBOX_SIZE), (256 * SKYBOX_SIZE), 32, 32, (8 * SKYBOX_SIZE), (8 * SKYBOX_SIZE), true, true},
},
[Cake] = {
{316, 228, 63, 29, 5, 8, false, false},
@@ -63,7 +64,7 @@ typedef struct {
} TableDimension;
static const TableDimension TABLE_DIMENSIONS[ImageType_MAX] = {
[Skybox] = {8, 10},
[Skybox] = {(8 * SKYBOX_SIZE), (10 * SKYBOX_SIZE)},
[Cake] = {5, 8},
[CakeEU] = {5, 7},
};
@@ -318,9 +319,9 @@ static void write_skybox_c() { /* write c data to disc */
fprintf(cFile, "const Texture *const %s_skybox_ptrlist[] = {\n", skyboxName);
for (int row = 0; row < 8; row++) {
for (int col = 0; col < 10; col++) {
fprintf(cFile, "%s_skybox_texture_%05X,\n", skyboxName, get_index(tiles, row * 8 + (col % 8)));
for (int row = 0; row < (8 * SKYBOX_SIZE); row++) {
for (int col = 0; col < (10 * SKYBOX_SIZE); col++) {
fprintf(cFile, "%s_skybox_texture_%05X,\n", skyboxName, get_index(tiles, row * (8 * SKYBOX_SIZE) + (col % (8 * SKYBOX_SIZE))));
}
}
@@ -567,6 +568,7 @@ bool imageMatchesDimensions(int width, int height) {
break;
}
}
if (!matchesDimensions) {
if (type != CakeEU) {
fprintf(stderr, "err: That type of image must be either %d x %d or %d x %d. Yours is %d x %d.\n",