Merge branch 'mr-origin-80'
This commit is contained in:
@@ -8,20 +8,20 @@
|
||||
s32 D_80275860 = 0;
|
||||
|
||||
void func_802409C0(f32 arg0[3], f32 arg1){
|
||||
f32 sp3C[3];
|
||||
f32 vp_rotation[3];
|
||||
f32 sp30[3];
|
||||
f32 sp28[2];
|
||||
f32 sp24;
|
||||
f32 dt;
|
||||
|
||||
sp24 = time_getDelta()*arg1;
|
||||
dt = time_getDelta()*arg1;
|
||||
func_8024E71C(0, sp28);
|
||||
|
||||
sp30[0] = sp28[0] * sp24;
|
||||
sp30[0] = sp28[0] * dt;
|
||||
sp30[1] = 0.0f;
|
||||
sp30[2] = -(sp28[1] * sp24);
|
||||
sp30[2] = -(sp28[1] * dt);
|
||||
|
||||
viewport_getRotation_vec3f(&sp3C);
|
||||
ml_vec3f_yaw_rotate_copy(sp30, sp30, sp3C[1]);
|
||||
viewport_getRotation_vec3f(vp_rotation);
|
||||
ml_vec3f_yaw_rotate_copy(sp30, sp30, vp_rotation[1]);
|
||||
|
||||
arg0[0] = arg0[0] + sp30[0];
|
||||
arg0[1] = arg0[1] + sp30[1];
|
||||
@@ -40,12 +40,12 @@ f32 func_80240A94(s32 arg0, f32 arg1){
|
||||
}
|
||||
|
||||
void func_80240AC8(f32 arg0[3], f32 arg1){
|
||||
f32 sp3C[3];
|
||||
f32 vp_rotation[3];
|
||||
f32 sp30[3];
|
||||
f32 sp28[2];
|
||||
f32 sp24;
|
||||
f32 dt;
|
||||
|
||||
sp24 = time_getDelta()*arg1;
|
||||
dt = time_getDelta()*arg1;
|
||||
func_8024E71C(0, sp28);
|
||||
|
||||
if(0.0f != sp28[0] || 0.0f != sp28[1]){
|
||||
@@ -57,13 +57,13 @@ void func_80240AC8(f32 arg0[3], f32 arg1){
|
||||
D_80275860 = 1;
|
||||
}
|
||||
|
||||
sp24 = func_80240A94(D_80275860, sp24);
|
||||
sp30[0] = sp28[0] * sp24;
|
||||
dt = func_80240A94(D_80275860, dt);
|
||||
sp30[0] = sp28[0] * dt;
|
||||
sp30[1] = 0.0f;
|
||||
sp30[2] = -(sp28[1] * sp24);
|
||||
sp30[2] = -(sp28[1] * dt);
|
||||
|
||||
viewport_getRotation_vec3f(&sp3C);
|
||||
ml_vec3f_yaw_rotate_copy(sp30, sp30, sp3C[1]);
|
||||
viewport_getRotation_vec3f(vp_rotation);
|
||||
ml_vec3f_yaw_rotate_copy(sp30, sp30, vp_rotation[1]);
|
||||
|
||||
arg0[0] = arg0[0] + sp30[0];
|
||||
arg0[1] = arg0[1] + sp30[1];
|
||||
|
Reference in New Issue
Block a user