mirror of
https://github.com/isledecomp/isle.git
synced 2026-01-24 00:31:16 +00:00
Remove some COMPAT_MODE
This commit is contained in:
parent
f983e44f10
commit
c2bd868d36
@ -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();
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user