mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-01 10:58:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add ymls for Torch code generator (#497)

Browse Source 
* Add torch

* update jenkinsfile
This commit is contained in:
MegaMech
2024-04-09 21:29:57 -06:00
committed by GitHub
parent 2b66867af1
commit 3da5a4f343
95 changed files with 4794 additions and 9877 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/racing/actors.c
+1 -1
View File
@@ -21,7 +21,7 @@
#include "effects.h"
#include "collision.h"
#include "audio/external.h"
#include "common_textures.h"
#include <assets/common_data.h>
#include "courses/all_course_data.h"
#include "main.h"
#include "data/other_textures.h"
src/racing/math_util.h
+1
View File
@@ -16,6 +16,7 @@
// Here to appease the pragma gods
double fabs(double x);
void func_802B5794(Mat4, Vec3f, Vec3f);
s32 func_802B4F60(s32, Vec3f, s32, f32, f32);
s32 render_set_position(Mat4, s32);
f32 func_802B51E8(Vec3f, Vec3f);
src/racing/skybox_and_splitscreen.c
+50 -57
View File
@@ -9,7 +9,7 @@
#include <common_structs.h>
#include "memory.h"
#include "camera.h"
#include "common_textures.h"
#include <assets/common_data.h>
#include "render_player.h"
#include "code_80057C60.h"
#include "code_80091750.h"
@@ -318,52 +318,37 @@ s32 D_802B8A90[] = {
0xba001402, 0x00000000, 0xb8000000, 0x00000000,
};
struct Skybox sSkyColors[21] = {
{128, 4280, 6136, 216, 7144, 32248},
{255, 255, 255, 255, 255, 255},
{48, 1544, 49528, 0, 0, 0},
{0, 0, 0, 0, 0, 0},
{113, 70, 255, 255, 184, 99},
{28, 11, 90, 0, 99, 164},
{48, 1688, 54136, 216, 7144, 32248},
{238, 144, 255, 255, 224, 240},
{128, 4280, 6136, 216, 7144, 32248},
{0, 18, 255, 197, 211, 255},
{0, 2, 94, 209, 65, 23},
{195, 231, 255, 255, 0xc0, 0},
{128, 4280, 6136, 216, 7144, 32248},
{0, 0, 0, 0, 0, 0},
{20, 30, 56, 40, 60, 110},
{128, 4280, 6136, 216, 7144, 32248},
{0, 0, 0, 0, 0, 0},
{113, 70, 255, 255, 184, 99},
{255, 174, 0, 255, 229, 124},
{0, 0, 0, 0, 0, 0},
{238, 144, 255, 255, 224, 240},
struct Skybox sSkyColors[] = {
#include "assets/course_metadata/sSkyColors.inc.c"
};
struct Skybox D_802B8BCC[21] = {
{0, 0, 0, 0, 0, 0},
{255, 255, 255, 255, 255, 255},
{0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0},
{95, 40, 15, 0, 0, 0},
{0, 99, 164, 0, 0, 0},
{48, 1688, 54136, 0, 0, 0},
{255, 224, 240, 0, 0, 0},
{216, 7144, 32248, 0, 0, 0},
{255, 184, 99, 0, 0, 0},
{209, 65, 23, 0, 0, 0},
{255, 192, 0, 0, 0, 0},
{216, 7144, 32248, 128, 4280, 6136},
{0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0},
{216, 7144, 32248, 0, 0, 0},
{0, 0, 0, 0, 0, 0},
{255, 224, 240, 0, 0, 0},
{22, 145, 22, 0, 0, 0},
{0, 0, 0, 0, 0, 0},
{255, 224, 240, 0, 0, 0},
// struct Skybox sSkyColors[] = {
// {128, 4280, 6136, 216, 7144, 32248},
// {255, 255, 255, 255, 255, 255},
// {48, 1544, 49528, 0, 0, 0},
// {0, 0, 0, 0, 0, 0},
// {113, 70, 255, 255, 184, 99},
// {28, 11, 90, 0, 99, 164},
// {48, 1688, 54136, 216, 7144, 32248},
// {238, 144, 255, 255, 224, 240},
// {128, 4280, 6136, 216, 7144, 32248},
// {0, 18, 255, 197, 211, 255},
// {0, 2, 94, 209, 65, 23},
// {195, 231, 255, 255, 0xc0, 0},
// {128, 4280, 6136, 216, 7144, 32248},
// {0, 0, 0, 0, 0, 0},
// {20, 30, 56, 40, 60, 110},
// {128, 4280, 6136, 216, 7144, 32248},
// {0, 0, 0, 0, 0, 0},
// {113, 70, 255, 255, 184, 99},
// {255, 174, 0, 255, 229, 124},
// {0, 0, 0, 0, 0, 0},
// {238, 144, 255, 255, 224, 240},
// };
struct Skybox sSkyColors2[] = {
#include "assets/course_metadata/sSkyColors2.inc.c"
};
void func_802A450C(Vtx *skybox) {
@@ -415,18 +400,18 @@ void func_802A450C(Vtx *skybox) {
skybox[3].v.cn[0] = sSkyColors[gCurrentCourseId].unk0;
skybox[3].v.cn[1] = sSkyColors[gCurrentCourseId].unk2;
skybox[3].v.cn[2] = sSkyColors[gCurrentCourseId].unk4;
skybox[4].v.cn[0] = D_802B8BCC[gCurrentCourseId].unk0;
skybox[4].v.cn[1] = D_802B8BCC[gCurrentCourseId].unk2;
skybox[4].v.cn[2] = D_802B8BCC[gCurrentCourseId].unk4;
skybox[5].v.cn[0] = D_802B8BCC[gCurrentCourseId].unk6;
skybox[5].v.cn[1] = D_802B8BCC[gCurrentCourseId].unk8;
skybox[5].v.cn[2] = D_802B8BCC[gCurrentCourseId].unkA;
skybox[6].v.cn[0] = D_802B8BCC[gCurrentCourseId].unk6;
skybox[6].v.cn[1] = D_802B8BCC[gCurrentCourseId].unk8;
skybox[6].v.cn[2] = D_802B8BCC[gCurrentCourseId].unkA;
skybox[7].v.cn[0] = D_802B8BCC[gCurrentCourseId].unk0;
skybox[7].v.cn[1] = D_802B8BCC[gCurrentCourseId].unk2;
skybox[7].v.cn[2] = D_802B8BCC[gCurrentCourseId].unk4;
skybox[4].v.cn[0] = sSkyColors2[gCurrentCourseId].unk0;
skybox[4].v.cn[1] = sSkyColors2[gCurrentCourseId].unk2;
skybox[4].v.cn[2] = sSkyColors2[gCurrentCourseId].unk4;
skybox[5].v.cn[0] = sSkyColors2[gCurrentCourseId].unk6;
skybox[5].v.cn[1] = sSkyColors2[gCurrentCourseId].unk8;
skybox[5].v.cn[2] = sSkyColors2[gCurrentCourseId].unkA;
skybox[6].v.cn[0] = sSkyColors2[gCurrentCourseId].unk6;
skybox[6].v.cn[1] = sSkyColors2[gCurrentCourseId].unk8;
skybox[6].v.cn[2] = sSkyColors2[gCurrentCourseId].unkA;
skybox[7].v.cn[0] = sSkyColors2[gCurrentCourseId].unk0;
skybox[7].v.cn[1] = sSkyColors2[gCurrentCourseId].unk2;
skybox[7].v.cn[2] = sSkyColors2[gCurrentCourseId].unk4;
}
void func_802A487C(Vtx *arg0, UNUSED struct UnkStruct_800DC5EC *arg1, UNUSED s32 arg2, UNUSED s32 arg3, UNUSED f32 *arg4) {
@@ -831,7 +816,11 @@ void render_player_one_2p_screen_vertical(void) {
UNUSED s32 pad[2];
u16 perspNorm;
Mat4 matrix;
#ifdef VERSION_EU
f32 sp9C;
#else
UNUSED f32 sp9C;
#endif
func_802A50EC();
#ifdef VERSION_EU
@@ -888,7 +877,11 @@ void render_player_two_2p_screen_vertical(void) {
UNUSED s32 pad[2];
u16 perspNorm;
Mat4 matrix;
#ifdef VERSION_EU
f32 sp9C;
#else
UNUSED f32 sp9C;
#endif
func_802A5004();
init_rdp();