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

Fixes/matches

Browse Source
This commit is contained in:
Christian Semmler 2024-03-21 10:24:23 -04:00
parent 397c2fd48b
commit d3686790e0
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
LEGO1/lego/legoomni/include/legoeventnotificationparam.h
View File

@ -12,10 +12,10 @@
class LegoEventNotificationParam : public MxNotificationParam { class LegoEventNotificationParam : public MxNotificationParam {
public: public:
enum { enum {
c_lButtonState = 1, c_lButtonState = 0x01,
c_rButtonState = 2, c_rButtonState = 0x02,
c_modKey1 = 4, c_modKey1 = 0x04,
c_modKey2 = 8, c_modKey2 = 0x08,
}; };
// FUNCTION: LEGO1 0x10028690 // FUNCTION: LEGO1 0x10028690
@ -42,7 +42,11 @@ class LegoEventNotificationParam : public MxNotificationParam {
inline MxU8 GetModifier() { return m_modifier; } inline MxU8 GetModifier() { return m_modifier; }
inline MxU8 GetKey() const { return m_key; } inline MxU8 GetKey() const { return m_key; }
// FUNCTION: LEGO1 0x10012190
inline MxS32 GetX() const { return m_x; } inline MxS32 GetX() const { return m_x; }
// FUNCTION: LEGO1 0x100121a0
inline MxS32 GetY() const { return m_y; } inline MxS32 GetY() const { return m_y; }
inline void SetROI(LegoROI* p_roi) { m_roi = p_roi; } inline void SetROI(LegoROI* p_roi) { m_roi = p_roi; }
@ -65,10 +69,4 @@ class LegoEventNotificationParam : public MxNotificationParam {
// SYNTHETIC: LEGO1 0x100287e0 // SYNTHETIC: LEGO1 0x100287e0
// LegoEventNotificationParam::~LegoEventNotificationParam // LegoEventNotificationParam::~LegoEventNotificationParam
// SYNTHETIC: LEGO1 0x10012190
// LegoEventNotificationParam::GetX
// SYNTHETIC: LEGO1 0x100121a0
// LegoEventNotificationParam::GetY
#endif // LEGOEVENTNOTIFICATIONPARAM_H #endif // LEGOEVENTNOTIFICATIONPARAM_H

4
LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
View File

@ -67,6 +67,7 @@ MxLong LegoCameraController::Notify(MxParam& p_param)
} break; } break;
} }
return SUCCESS; return SUCCESS;
} }
@ -113,8 +114,9 @@ void LegoCameraController::SetWorldTransform(const Vector3& p_at, const Vector3&
} }
// STUB: LEGO1 0x100123e0 // STUB: LEGO1 0x100123e0
void LegoCameraController::FUN_100123e0(const Matrix4& p_transform, MxU32 p_un) void LegoCameraController::FUN_100123e0(const Matrix4& p_transform, MxU32)
{ {
// TODO
} }
// FUNCTION: LEGO1 0x10012740 // FUNCTION: LEGO1 0x10012740

7
LEGO1/lego/sources/roi/legoroi.cpp
View File

@ -481,16 +481,17 @@ TimeROI::TimeROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, LegoTime p_t
void TimeROI::FUN_100a9b40(Matrix4& p_matrix, LegoTime p_time) void TimeROI::FUN_100a9b40(Matrix4& p_matrix, LegoTime p_time)
{ {
LegoTime time = p_time - m_time; LegoTime time = p_time - m_time;
if (time) { if (time) {
m_time = p_time; m_time = p_time;
Mx3DPointFloat targetPosition(p_matrix[3]); Mx3DPointFloat targetPosition(p_matrix[3]);
Vector3 worldPosition(GetWorldPosition()); // TODO: Figure out how to get type right for the call
targetPosition.Sub(&worldPosition); ((Vector3&) targetPosition).Sub(&Vector3(m_local2world[3]));
float division = time * 0.001; float division = time * 0.001;
targetPosition.Div(division); ((Vector3&) targetPosition).Div(division);
FUN_100a5a30(targetPosition); FUN_100a5a30(targetPosition);
} }

6
LEGO1/omni/include/mxpoint32.h
View File

@ -6,7 +6,10 @@
class MxPoint32 { class MxPoint32 {
public: public:
MxPoint32() {} MxPoint32() {}
// FUNCTION: LEGO1 0x10012170
MxPoint32(MxS32 p_x, MxS32 p_y) { CopyFrom(p_x, p_y); } MxPoint32(MxS32 p_x, MxS32 p_y) { CopyFrom(p_x, p_y); }
MxPoint32(const MxPoint32& p_point) MxPoint32(const MxPoint32& p_point)
{ {
this->m_x = p_point.m_x; this->m_x = p_point.m_x;
@ -30,7 +33,4 @@ class MxPoint32 {
MxS32 m_y; // 0x04 MxS32 m_y; // 0x04
}; };
// SYNTHETIC: LEGO1 0x10012170
// MxPoint32::MxPoint32
#endif // MXPOINT32_H #endif // MXPOINT32_H