isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 02:31:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Rename

Browse Source
This commit is contained in:
Christian Semmler 2024-03-13 19:29:35 -04:00
parent 97ff0be137
commit 64e10bc2b9
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/include/legoentity.h
View File

@ -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; }

6
LEGO1/lego/legoomni/src/entity/legoentity.cpp
View File

@ -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 =

10
LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
View File

@ -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
);