mirror of
https://github.com/zeldaret/tww.git
synced 2026-09-10 19:59:55 -04:00
Fix camera_class view member
This commit is contained in:
+12
-12
@@ -557,13 +557,13 @@ static fopAc_ac_c* search_target(himo2_class* i_this, cXyz param_2) {
|
||||
if (f4 < f31) {
|
||||
cXyz sp24;
|
||||
camera_process_class* camera = dComIfGp_getCamera(0);
|
||||
sp24.x = param_2.x - camera->mLookat.mEye.x;
|
||||
sp24.y = param_2.y - camera->mLookat.mEye.y;
|
||||
sp24.z = param_2.z - camera->mLookat.mEye.z;
|
||||
sp24.x = param_2.x - camera->view.mLookat.mEye.x;
|
||||
sp24.y = param_2.y - camera->view.mLookat.mEye.y;
|
||||
sp24.z = param_2.z - camera->view.mLookat.mEye.z;
|
||||
cXyz sp18;
|
||||
sp18.x = r28->current.pos.x - camera->mLookat.mEye.x;
|
||||
sp18.y = r28->current.pos.y - camera->mLookat.mEye.y;
|
||||
sp18.z = r28->current.pos.z - camera->mLookat.mEye.z;
|
||||
sp18.x = r28->current.pos.x - camera->view.mLookat.mEye.x;
|
||||
sp18.y = r28->current.pos.y - camera->view.mLookat.mEye.y;
|
||||
sp18.z = r28->current.pos.z - camera->view.mLookat.mEye.z;
|
||||
r21 = (s16)cM_atan2s(sp24.x, sp24.z);
|
||||
r21 = (s16)cM_atan2s(sp18.x, sp18.z) - r21;
|
||||
if (r21 < 0) {
|
||||
@@ -876,9 +876,9 @@ static void new_himo2_move(himo2_class* i_this) {
|
||||
i_this->m02A0 = REG0_S(9) + 10;
|
||||
i_this->m02A2 = 3;
|
||||
camera2 = dComIfGp_getCamera(0);
|
||||
f28 = i_this->m2524.x - camera2->mLookat.mEye.x;
|
||||
f27 = i_this->m2524.y - camera2->mLookat.mEye.y;
|
||||
f26_3 = i_this->m2524.z - camera2->mLookat.mEye.z;
|
||||
f28 = i_this->m2524.x - camera2->view.mLookat.mEye.x;
|
||||
f27 = i_this->m2524.y - camera2->view.mLookat.mEye.y;
|
||||
f26_3 = i_this->m2524.z - camera2->view.mLookat.mEye.z;
|
||||
sp130.z = REG0_F(15) * 100.0f + 1000.0f;
|
||||
if (std::sqrtf(SQUARE(f28) + SQUARE(f27) + SQUARE(f26_3)) > sp130.z) {
|
||||
r24_2 = cM_atan2s(f28, f26_3);
|
||||
@@ -888,9 +888,9 @@ static void new_himo2_move(himo2_class* i_this) {
|
||||
sp130.x = 0.0f;
|
||||
sp130.y = 0.0f;
|
||||
MtxPosition(&sp130, &sp124);
|
||||
i_this->m2524.x = camera2->mLookat.mEye.x + sp124.x;
|
||||
i_this->m2524.y = camera2->mLookat.mEye.y + sp124.y;
|
||||
i_this->m2524.z = camera2->mLookat.mEye.z + sp124.z;
|
||||
i_this->m2524.x = camera2->view.mLookat.mEye.x + sp124.x;
|
||||
i_this->m2524.y = camera2->view.mLookat.mEye.y + sp124.y;
|
||||
i_this->m2524.z = camera2->view.mLookat.mEye.z + sp124.z;
|
||||
}
|
||||
himo2_s* phVar18 = i_this->m0310;
|
||||
if (r30 != 0) {
|
||||
|
||||
Reference in New Issue
Block a user