This commit is contained in:
MegaMech
2025-05-17 13:02:36 -06:00
parent af63558bac
commit b57f562c8a
6 changed files with 11 additions and 7 deletions
+5 -1
View File
@@ -2,6 +2,7 @@
#include <libultra/gbi.h>
#include "Lakitu.h"
#include <vector>
#include "port/interpolation/FrameInterpolation.h"
#include "port/Game.h"
@@ -10,6 +11,7 @@ extern "C" {
#include "main.h"
#include "actors.h"
#include "math_util.h"
#include "math_util_2.h"
#include "sounds.h"
#include "update_objects.h"
#include "render_player.h"
@@ -21,7 +23,6 @@ extern "C" {
#include "code_80057C60.h"
#include "defines.h"
#include "code_80005FD0.h"
#include "math_util_2.h"
#include "collision.h"
#include "assets/bowsers_castle_data.h"
#include "ceremony_and_credits.h"
@@ -95,6 +96,8 @@ void OLakitu::Draw(s32 cameraId) {
s32 objectIndex;
Object* object;
FrameInterpolation_RecordOpenChild("Lakitu",(u32) 3939848893);
objectIndex = gIndexLakituList[cameraId];
camera = &camera1[cameraId];
if (is_obj_flag_status_active(objectIndex, 0x00000010) != 0) {
@@ -126,6 +129,7 @@ void OLakitu::Draw(s32 cameraId) {
}
}
}
FrameInterpolation_RecordCloseChild();
}
void OLakitu::func_80079114(s32 objectIndex, s32 playerId, s32 arg2) {
-1
View File
@@ -603,7 +603,6 @@ void func_80041D24(void) {
}
void guOrtho(Mtx*, f32, f32, f32, f32, f32, f32, f32); /* extern */
extern s8 D_801658FE;
void func_80041D34(void) {
guOrtho(&D_80183D60, 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f);
-3
View File
@@ -84,7 +84,4 @@ void rsp_set_matrix_transformation_inverted_x_y_orientation(Vec3f, Vec3su, f32);
void rsp_set_matrix_transl_rot_scale(Vec3f, Vec3f, f32);
void rsp_set_matrix_gObjectList(s32);
/* This is where I'd put my static data, if I had any */
extern s8 D_801658FE;
#endif // MATH_UTIL_2_H
@@ -6,7 +6,7 @@
#include <math.h>
#include "port/Engine.h"
#include <math_util.h>
#include <math_util_2.h>
#include "math_util_2.h"
#include "FrameInterpolation.h"
#include "matrix.h"
@@ -4,7 +4,6 @@
// #include "sf64math.h"
#include <libultraship.h>
#include <common_structs.h>
#include <math_util_2.h>
#ifdef __cplusplus
+5
View File
@@ -2444,11 +2444,15 @@ void render_course_actors(struct UnkStruct_800DC5EC* arg0) {
if (actor->flags == 0) {
continue;
}
FrameInterpolation_RecordOpenChild(actor, i);
switch (actor->type) {
default: // Draw custom actor
CM_DrawActors(D_800DC5EC->camera, actor);
break;
case ACTOR_TREE_MARIO_RACEWAY:
render_actor_tree_mario_raceway(camera, sBillBoardMtx, actor);
break;
case ACTOR_TREE_YOSHI_VALLEY:
@@ -2548,6 +2552,7 @@ void render_course_actors(struct UnkStruct_800DC5EC* arg0) {
render_actor_yoshi_egg(camera, sBillBoardMtx, (struct YoshiValleyEgg*) actor, pathCounter);
break;
}
FrameInterpolation_RecordCloseChild(actor, i);
}
if (GetCourse() == GetMooMooFarm()) {
render_cows(camera, sBillBoardMtx);