mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix LegoROI / add TimeROI (#572)

Browse Source 
* Fix LegoROI / add TimeROI

* Fix order

* Remove extra fwd decl
This commit is contained in:
Christian Semmler
2024-02-17 10:07:34 -05:00
committed by GitHub
parent b47412183b
commit 332d8da695
14 changed files with 117 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/realtime/orientableroi.cpp
View File

@@ -53,8 +53,8 @@ void OrientableROI::UpdateWorldData(const MxMatrix& p_transform)
UpdateWorldVelocity();
// iterate over comps
if (m_comp) {
for (CompoundObject::iterator iter = m_comp->begin(); !(iter == m_comp->end()); iter++) {
if (comp) {
for (CompoundObject::iterator iter = comp->begin(); !(iter == comp->end()); iter++) {
ROI* child = *iter;
static_cast<OrientableROI*>(child)->UpdateWorldData(p_transform);
}

36
LEGO1/realtime/roi.h
View File

@@ -21,8 +21,8 @@ public:
Mx3DPointFloat& Max() { return max; }
private:
Mx3DPointFloat min;
Mx3DPointFloat max;
Mx3DPointFloat min; // 0x00
Mx3DPointFloat max; // 0x14
};
/*
@@ -37,8 +37,8 @@ public:
float& Radius() { return radius; }
private:
Mx3DPointFloat center;
float radius;
Mx3DPointFloat center; // 0x00
float radius; // 0x14
};
/*
@@ -79,43 +79,45 @@ class ROI {
public:
ROI()
{
m_comp = 0;
m_lods = 0;
comp = 0;
lods = 0;
m_unk0x0c = 1;
}
virtual ~ROI()
{
// if derived class set the comp and lods, it should delete them
assert(!m_comp);
assert(!m_lods);
assert(!comp);
assert(!lods);
}
virtual float IntrinsicImportance() const = 0; // vtable+0x04
virtual const float* GetWorldVelocity() const = 0; // vtable+0x08
virtual const BoundingBox& GetWorldBoundingBox() const = 0; // vtable+0x0c
virtual const BoundingSphere& GetWorldBoundingSphere() const = 0; // vtable+0x10
const LODListBase* GetLODs() const { return m_lods; }
const LODListBase* GetLODs() const { return lods; }
const LODObject* GetLOD(int i) const
{
assert(m_lods);
return (*m_lods)[i];
assert(lods);
return (*lods)[i];
}
int GetLODCount() const { return m_lods ? m_lods->Size() : 0; }
const CompoundObject* GetComp() const { return m_comp; }
int GetLODCount() const { return lods ? lods->Size() : 0; }
const CompoundObject* GetComp() const { return comp; }
inline undefined GetUnknown0x0c() { return m_unk0x0c; }
inline void SetUnknown0x0c(undefined p_unk0x0c) { m_unk0x0c = p_unk0x0c; }
// SYNTHETIC: LEGO1 0x100a5d60
// ROI::`scalar deleting destructor'
protected:
CompoundObject* m_comp; // 0x04
LODListBase* m_lods; // 0x08
undefined m_unk0x0c; // 0x0c
CompoundObject* comp; // 0x04
LODListBase* lods; // 0x08
undefined m_unk0x0c; // 0x0c
};
// TEMPLATE: LEGO1 0x10084930
// list<ROI *,allocator<ROI *> >::~list<ROI *,allocator<ROI *> >
// SYNTHETIC: LEGO1 0x100a5d50
// ROI::~ROI