From c2bd868d3629cfe66248ee4e89f1a4709231e90c Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Thu, 6 Jun 2024 11:38:24 -0400 Subject: [PATCH] Remove some COMPAT_MODE --- LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp | 5 ----- LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp | 5 ----- LEGO1/lego/sources/roi/legoroi.cpp | 6 ------ 3 files changed, 16 deletions(-) diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp index 5ff93262..723a1a30 100644 --- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp @@ -648,12 +648,7 @@ void LegoAnimPresenter::PutFrame() up = und; -#ifdef COMPAT_MODE - Mx3DPointFloat location = m_currentWorld->GetCamera()->GetWorldLocation(); - ((Vector3&) up).Sub(location); -#else ((Vector3&) up).Sub(m_currentWorld->GetCamera()->GetWorldLocation()); -#endif ((Vector3&) dir).Div(dirsqr); pos.EqualsCross(&dir, &up); pos.Unitize(); diff --git a/LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp index cb76955a..56386538 100644 --- a/LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legoloopinganimpresenter.cpp @@ -66,12 +66,7 @@ void LegoLoopingAnimPresenter::PutFrame() up = und; -#ifdef COMPAT_MODE - Mx3DPointFloat location = m_currentWorld->GetCamera()->GetWorldLocation(); - ((Vector3&) up).Sub(location); -#else ((Vector3&) up).Sub(m_currentWorld->GetCamera()->GetWorldLocation()); -#endif ((Vector3&) dir).Div(dirsqr); pos.EqualsCross(&dir, &up); pos.Unitize(); diff --git a/LEGO1/lego/sources/roi/legoroi.cpp b/LEGO1/lego/sources/roi/legoroi.cpp index 66a8ace1..c2f35dae 100644 --- a/LEGO1/lego/sources/roi/legoroi.cpp +++ b/LEGO1/lego/sources/roi/legoroi.cpp @@ -708,13 +708,7 @@ void TimeROI::FUN_100a9b40(Matrix4& p_matrix, LegoTime p_time) Mx3DPointFloat targetPosition(p_matrix[3]); // TODO: Figure out how to get type right for the call - // TODO: Fix constness of vector/matrix functions -#ifdef COMPAT_MODE - Vector3 worldPosition(m_local2world[3]); - ((Vector3&) targetPosition).Sub(worldPosition); -#else ((Vector3&) targetPosition).Sub(Vector3(m_local2world[3])); -#endif float division = time * 0.001; ((Vector3&) targetPosition).Div(division);