diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h index e7d5eafd..5db4180e 100644 --- a/LEGO1/lego/legoomni/include/legoentity.h +++ b/LEGO1/lego/legoomni/include/legoentity.h @@ -66,9 +66,9 @@ class LegoEntity : public MxEntity { void FUN_10010c30(); void FUN_100114e0(MxU8 p_unk0x59); void SetLocation(const Vector3& p_location, const Vector3& p_direction, const Vector3& p_up, MxBool p_und); - Mx3DPointFloat GetEntitydDirection(); - Mx3DPointFloat GetEntityUp(); - Mx3DPointFloat GetEntityPosition(); + Mx3DPointFloat GetWorldDirection(); + Mx3DPointFloat GetWorldUp(); + Mx3DPointFloat GetWorldPosition(); inline LegoROI* GetROI() { return m_roi; } inline MxU8 GetFlags() { return m_flags; } diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp index c2897423..ffda6f6c 100644 --- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp @@ -185,7 +185,7 @@ void LegoEntity::FUN_10010c30() } // FUNCTION: LEGO1 0x10010c60 -Mx3DPointFloat LegoEntity::GetEntitydDirection() +Mx3DPointFloat LegoEntity::GetWorldDirection() { if (m_roi != NULL) { m_worldDirection = @@ -196,7 +196,7 @@ Mx3DPointFloat LegoEntity::GetEntitydDirection() } // FUNCTION: LEGO1 0x10010cf0 -Mx3DPointFloat LegoEntity::GetEntityUp() +Mx3DPointFloat LegoEntity::GetWorldUp() { if (m_roi != NULL) { m_worldUp = Mx3DPointFloat(m_roi->GetWorldUp()[0], m_roi->GetWorldUp()[1], m_roi->GetWorldUp()[2]); @@ -206,7 +206,7 @@ Mx3DPointFloat LegoEntity::GetEntityUp() } // FUNCTION: LEGO1 0x10010d80 -Mx3DPointFloat LegoEntity::GetEntityPosition() +Mx3DPointFloat LegoEntity::GetWorldPosition() { if (m_roi != NULL) { m_worldLocation = diff --git a/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp index a528b10f..873b3ac4 100644 --- a/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp +++ b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp @@ -199,12 +199,12 @@ void LegoPointOfViewController::SetEntity(LegoEntity* p_entity) CalcLocalTransform( Mx3DPointFloat( - m_entity->GetEntityPosition()[0], - m_entity->GetEntityPosition()[1] + m_entityOffsetUp, - m_entity->GetEntityPosition()[2] + m_entity->GetWorldPosition()[0], + m_entity->GetWorldPosition()[1] + m_entityOffsetUp, + m_entity->GetWorldPosition()[2] ), - m_entity->GetEntitydDirection(), - m_entity->GetEntityUp(), + m_entity->GetWorldDirection(), + m_entity->GetWorldUp(), mat );