mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-07 02:05:35 -04:00
C_BG_MIN_HEIGHT, C_BG_MAX_HEIGHT
This commit is contained in:
@@ -4,7 +4,8 @@
|
||||
#include "SSystem/SComponent/c_bg_s_poly_info.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
#define C_BG_INVALID_HEIGHT (-1e+9f)
|
||||
#define C_BG_MIN_HEIGHT (-1e+9f)
|
||||
#define C_BG_MAX_HEIGHT (1e+9f)
|
||||
|
||||
class fopAc_ac_c;
|
||||
class cBgS_ShdwDraw;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#ifndef C_M3D_G_AAB_H
|
||||
#define C_M3D_G_AAB_H
|
||||
|
||||
#include "SSystem/SComponent/c_bg_s.h"
|
||||
#include "SSystem/SComponent/c_xyz.h"
|
||||
#include "SSystem/SComponent/c_m3d.h"
|
||||
#include "SSystem/SComponent/c_m3d_g_lin.h"
|
||||
@@ -61,8 +62,8 @@ public:
|
||||
mMax.x = -1000000000.0f;
|
||||
}
|
||||
void ClearForMinMaxY() {
|
||||
mMin.y = 1000000000.0f;
|
||||
mMax.y = -1000000000.0f;
|
||||
mMin.y = C_BG_MAX_HEIGHT;
|
||||
mMax.y = C_BG_MIN_HEIGHT;
|
||||
}
|
||||
void SetMinMaxY(f32 y) {
|
||||
if (mMin.y > y) {
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
#ifndef D_A_BOMB_H
|
||||
#define D_A_BOMB_H
|
||||
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "d/d_a_obj.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
#include "d/d_particle.h"
|
||||
#include "d/d_bg_s_acch.h"
|
||||
#include "d/d_cc_d.h"
|
||||
@@ -178,7 +177,9 @@ private:
|
||||
/* 0x2FC */ dBgS_BombAcch mAcch;
|
||||
/* 0x4C0 */ dBgS_AcchCir mCir;
|
||||
/* 0x500 */ dBgS_ObjGndChk_Yogan mGndChk;
|
||||
/* 0x554 */ cXyz field_0x554;
|
||||
/* 0x554 */ f32 field_0x554;
|
||||
/* 0x558 */ f32 field_0x558;
|
||||
/* 0x55C */ f32 field_0x55C;
|
||||
/* 0x560 */ bool field_0x560;
|
||||
/* 0x561 */ bool mbWaterIn;
|
||||
/* 0x562 */ u8 field_0x562;
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
#ifndef D_A_BOMB_2_H
|
||||
#define D_A_BOMB_2_H
|
||||
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "d/d_a_obj.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
#include "d/d_particle.h"
|
||||
#include "d/d_bg_s_acch.h"
|
||||
#include "d/d_cc_d.h"
|
||||
|
||||
+1
-1
@@ -121,7 +121,7 @@ public:
|
||||
mWallRadius = 0.0f;
|
||||
pm_pos = NULL;
|
||||
pm_old_pos = NULL;
|
||||
mGroundH = C_BG_INVALID_HEIGHT;
|
||||
mGroundH = C_BG_MIN_HEIGHT;
|
||||
field_0x60 = 0;
|
||||
field_0x68 = 20.0f;
|
||||
field_0x58 = NULL;
|
||||
|
||||
@@ -2982,10 +2982,10 @@ int dComIfGd_setShadow(u32 id, s8 param_2, J3DModel* pModel, cXyz* pPos, f32 par
|
||||
s16 rotY = 0, f32 param_12 = 1.0f,
|
||||
GXTexObj* pTexObj = dDlst_shadowControl_c::getSimpleTex());
|
||||
|
||||
inline int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cXyz* param_3,
|
||||
inline int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 groundY, f32 param_2, cXyz* param_3,
|
||||
s16 i_angle = 0, f32 param_5 = 1.0f,
|
||||
GXTexObj* i_tex = dDlst_shadowControl_c::getSimpleTex()) {
|
||||
return g_dComIfG_gameInfo.drawlist.setSimpleShadow(i_pos, param_1, param_2, param_3, i_angle,
|
||||
return g_dComIfG_gameInfo.drawlist.setSimpleShadow(i_pos, groundY, param_2, param_3, i_angle,
|
||||
param_5, i_tex);
|
||||
}
|
||||
|
||||
|
||||
@@ -551,9 +551,9 @@ public:
|
||||
void drawXluListInvisible() { drawXluDrawList(mpXluListInvisible); }
|
||||
void drawOpaList2D() { drawOpaDrawList(mpOpaList2D); }
|
||||
|
||||
int setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cXyz* param_3, s16 i_angle,
|
||||
int setSimpleShadow(cXyz* i_pos, f32 groundY, f32 param_2, cXyz* param_3, s16 i_angle,
|
||||
f32 param_5, GXTexObj* i_tex) {
|
||||
return mShadowControl.setSimple(i_pos, param_1, param_2, param_3, i_angle, param_5,
|
||||
return mShadowControl.setSimple(i_pos, groundY, param_2, param_3, i_angle, param_5,
|
||||
i_tex);
|
||||
}
|
||||
int setRealShadow(u32 id, s8 param_2, J3DModel* pModel, cXyz* pPos, f32 param_5, f32 param_6,
|
||||
|
||||
Reference in New Issue
Block a user