PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-16 22:17:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace int types in Retro code

Browse Source 
Retro seemingly avoided using the Dolphin
typedefs in most places, opting to use int/uint
instead. This likely means they didn't use
u8/s8/u16/s16/etc either.
This commit is contained in:
Luke Street
2022-10-09 01:37:23 -04:00
parent 39700ad779
commit 133326ae40
172 changed files with 1525 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/WorldFormat/CAreaOctTree.hpp
View File

@@ -19,17 +19,17 @@ public:
struct SRayResult {
CPlane x0_plane;
rstl::optional_object< CCollisionSurface > x10_surface;
f32 x3c_t;
float x3c_t;
};
class TriListReference {
public:
explicit TriListReference(const u16* ptr) : m_ptr(ptr) {}
u16 GetAt(int idx) const { return m_ptr[idx + 1]; }
u16 GetSize() const { return m_ptr[0]; }
explicit TriListReference(const ushort* ptr) : m_ptr(ptr) {}
ushort GetAt(int idx) const { return m_ptr[idx + 1]; }
ushort GetSize() const { return m_ptr[0]; }
private:
const u16* m_ptr;
const ushort* m_ptr;
};
class Node {
@@ -38,35 +38,35 @@ public:
Node(const void* ptr, const CAABox& aabb, const CAreaOctTree& owner, ETreeType type)
: x0_aabb(aabb)
, x18_ptr(reinterpret_cast< const u8* >(ptr))
, x18_ptr(reinterpret_cast< const uchar* >(ptr))
, x1c_owner(owner)
, x20_nodeType(type) {}
bool LineTest(const CLine& line, const CMaterialFilter& filter, f32 length) const;
bool LineTest(const CLine& line, const CMaterialFilter& filter, float length) const;
void LineTestEx(const CLine& line, const CMaterialFilter& filter, SRayResult& res,
f32 length) const;
float length) const;
const CAreaOctTree& GetOwner() const { return x1c_owner; }
const CAABox& GetBoundingBox() const { return x0_aabb; }
u16 GetChildFlags() const { return *reinterpret_cast< const u16* >(x18_ptr); }
ushort GetChildFlags() const { return *reinterpret_cast< const ushort* >(x18_ptr); }
Node GetChild(int idx) const;
TriListReference GetTriangleArray() const;
ETreeType GetChildType(int idx) const {
u16 flags = *reinterpret_cast< const u16* >(x18_ptr);
ushort flags = *reinterpret_cast< const ushort* >(x18_ptr);
return ETreeType((flags >> (2 * idx)) & 0x3);
}
ETreeType GetTreeType() const { return x20_nodeType; }
private:
CAABox x0_aabb;
const u8* x18_ptr;
const uchar* x18_ptr;
const CAreaOctTree& x1c_owner;
ETreeType x20_nodeType;
bool LineTestInternal(const CLine& line, const CMaterialFilter& filter, f32 lT, f32 hT,
f32 maxT, const CVector3f& vec) const;
bool LineTestInternal(const CLine& line, const CMaterialFilter& filter, float lT, float hT,
float maxT, const CVector3f& vec) const;
void LineTestExInternal(const CLine& line, const CMaterialFilter& filter, SRayResult& res,
f32 lT, f32 hT, f32 maxT, const CVector3f& dirRecip) const;
float lT, float hT, float maxT, const CVector3f& dirRecip) const;
};
// TODO
@@ -74,17 +74,17 @@ public:
private:
CAABox x0_aabb;
Node::ETreeType x18_treeType;
const u8* x1c_buf;
const u8* x20_treeBuf;
const uchar* x1c_buf;
const uchar* x20_treeBuf;
uint x24_matCount;
const uint* x28_materials;
const u8* x2c_vertMats;
const u8* x30_edgeMats;
const u8* x34_polyMats;
const uchar* x2c_vertMats;
const uchar* x30_edgeMats;
const uchar* x34_polyMats;
uint x38_edgeCount;
const CCollisionEdge* x3c_edges;
uint x40_polyCount;
const u16* x44_polyEdges;
const ushort* x44_polyEdges;
uint x48_vertCount;
const float* x4c_verts;
};

2
include/WorldFormat/CCollidableOBBTreeGroup.hpp
View File

@@ -26,7 +26,7 @@ public:
CCollidableOBBTreeGroup(CCollidableOBBTreeGroupContainer* container,
const CMaterialList& matList);
u32 GetTableIndex() const override;
uint GetTableIndex() const override;
CAABox CalculateAABox(const CTransform4f&) const override;
CAABox CalculateLocalAABox() const override;
FourCC GetPrimType() const override;

4
include/WorldFormat/CMetroidAreaCollider.hpp
View File

@@ -15,7 +15,7 @@ public:
public:
COctreeLeafCache(const CAreaOctTree& octTree);
void AddLeaf(const CAreaOctTree::Node& node);
u32 GetNumLeaves() const { return x4_nodeCache.size(); }
uint GetNumLeaves() const { return x4_nodeCache.size(); }
bool HasCacheOverflowed() const { return x908_24_overflow; }
const CAreaOctTree& GetOctTree() const { return x0_octTree; }
rstl::reserved_vector< CAreaOctTree::Node, 64 >::const_iterator begin() const {
@@ -45,7 +45,7 @@ public:
const CAABox& GetCacheBounds() const { return x0_aabb; }
void SetCacheBounds(const CAABox& aabb) { x0_aabb = aabb; }
void AddOctreeLeafCache(const CMetroidAreaCollider::COctreeLeafCache& leafCache);
u32 GetNumCaches() const { return x18_leafCaches.size(); }
uint GetNumCaches() const { return x18_leafCaches.size(); }
const CMetroidAreaCollider::COctreeLeafCache& GetOctreeLeafCache(int idx) {
return x18_leafCaches[idx];
}